i8253: Make pcsp sound driver use the shared i8253_lock
authorRalf Baechle <ralf@linux-mips.org>
Wed, 1 Jun 2011 18:05:03 +0000 (19:05 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 9 Jun 2011 13:01:39 +0000 (15:01 +0200)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Acked-by: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
Link: http://lkml.kernel.org/r/20110601180610.532642190@duck.linux-mips.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
sound/drivers/pcsp/pcsp.h

index 6757c30..fc7a2dc 100644 (file)
 #define __PCSP_H__
 
 #include <linux/hrtimer.h>
-#include <linux/timex.h>
-#if defined(CONFIG_MIPS) || defined(CONFIG_X86)
-/* Use the global PIT lock ! */
 #include <linux/i8253.h>
-#else
-#include <asm/8253pit.h>
-static DEFINE_RAW_SPINLOCK(i8253_lock);
-#endif
+#include <linux/timex.h>
 
 #define PCSP_SOUND_VERSION 0x400       /* read 4.00 */
 #define PCSP_DEBUG 0