[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-1a8588c908e98c3b31a3a35595a94c655d569222@git.kernel.org>
Date: Thu, 9 Jun 2011 11:18:08 GMT
From: tip-bot for Ralf Baechle <ralf@...ux-mips.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
ralf@...ux-mips.org, tglx@...utronix.de, tiwai@...e.de,
perex@...ex.cz
Subject: [tip:timers/cleanup] i8253: Make pcsp sound driver use the shared i8253_lock
Commit-ID: 1a8588c908e98c3b31a3a35595a94c655d569222
Gitweb: http://git.kernel.org/tip/1a8588c908e98c3b31a3a35595a94c655d569222
Author: Ralf Baechle <ralf@...ux-mips.org>
AuthorDate: Wed, 1 Jun 2011 19:05:03 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 9 Jun 2011 12:03:50 +0200
i8253: Make pcsp sound driver use the shared i8253_lock
Signed-off-by: Ralf Baechle <ralf@...ux-mips.org>
Cc: Jaroslav Kysela <perex@...ex.cz>
Acked-by: Takashi Iwai <tiwai@...e.de>
Cc: alsa-devel@...a-project.org
Link: http://lkml.kernel.org/r/20110601180610.532642190@duck.linux-mips.net
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists