Commit-ID: 98b2f99537f6999c6544e89cddc1e1f9052d0ec7
Gitweb: http://git.kernel.org/tip/98b2f99537f6999c6544e89cddc1e1f9052d0ec7
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Fri, 3 Jun 2011 17:44:16 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Thu, 9 Jun 2011 12:03:50 +0200
i8253: Remove I8253_LOCK config
Now that all extra ifdeffed implementations are gone, remove the
config and depend the lock compile and the export on PCSPKR_PLATFORM
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
---
drivers/clocksource/Kconfig | 5 +----
drivers/clocksource/i8253.c | 2 ++
init/Kconfig | 1 -
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 330343b..151d30f 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -1,11 +1,8 @@
config CLKSRC_I8253
bool
-config I8253_LOCK
- bool
-
config CLKBLD_I8253
- def_bool y if CLKSRC_I8253 || I8253_LOCK
+ def_bool y if CLKSRC_I8253 || PCSPKR_PLATFORM
config CLKSRC_MMIO
bool
diff --git a/drivers/clocksource/i8253.c b/drivers/clocksource/i8253.c
index e594f52..39288c1 100644
--- a/drivers/clocksource/i8253.c
+++ b/drivers/clocksource/i8253.c
@@ -16,7 +16,9 @@
* 0061-0061 : NMI Control Register which contains two speaker control bits.
*/
DEFINE_RAW_SPINLOCK(i8253_lock);
+#ifdef CONFIG_PCSPKR_PLATFORM
EXPORT_SYMBOL(i8253_lock);
+#endif
#ifdef CONFIG_CLKSRC_I8253
/*
diff --git a/init/Kconfig b/init/Kconfig
index 2d2ef44..ebafac4 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1002,7 +1002,6 @@ config ELF_CORE
config PCSPKR_PLATFORM
bool "Enable PC-Speaker support" if EXPERT
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
- select I8253_LOCK
default y
help
This option allows to disable the internal PC-Speaker
--
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
|