Commit-ID: 8e1b5adfbee97a187d3e7188a0b248619b76682e Gitweb: http://git.kernel.org/tip/8e1b5adfbee97a187d3e7188a0b248619b76682e Author: Ralf Baechle <ralf@xxxxxxxxxxxxxx> AuthorDate: Wed, 1 Jun 2011 19:05:03 +0100 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Thu, 9 Jun 2011 15:01:39 +0200 i8253: Make pcsp sound driver use the shared i8253_lock Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Jaroslav Kysela <perex@xxxxxxxx> Acked-by: Takashi Iwai <tiwai@xxxxxxx> Cc: alsa-devel@xxxxxxxxxxxxxxxx Link: http://lkml.kernel.org/r/20110601180610.532642190@xxxxxxxxxxxxxxxxxxx Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- sound/drivers/pcsp/pcsp.h | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h index 6757c30..fc7a2dc 100644 --- a/sound/drivers/pcsp/pcsp.h +++ b/sound/drivers/pcsp/pcsp.h @@ -10,14 +10,8 @@ #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 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|