From 42ad9cf9ea8b85ad991ddd81f1384af184134e98 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 1 Jun 2011 19:05:03 +0100
Subject: [PATCH] --- yaml --- r: 257185 b: refs/heads/master c:
 8e1b5adfbee97a187d3e7188a0b248619b76682e h: refs/heads/master i:   257183:
 9b1cef1fd3a1b188f8cffee45566fb64a5597b63 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/drivers/pcsp/pcsp.h | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 884cf94bcd29..b3ab06858715 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16ba9b061223c8a58b9b2e0dd01435111c4e902a
+refs/heads/master: 8e1b5adfbee97a187d3e7188a0b248619b76682e
diff --git a/trunk/sound/drivers/pcsp/pcsp.h b/trunk/sound/drivers/pcsp/pcsp.h
index 6757c304ee46..fc7a2dc410a1 100644
--- a/trunk/sound/drivers/pcsp/pcsp.h
+++ b/trunk/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