Merge branch 'upstream/ticketlock-cleanup' of git://github.com/jsgf/linux-xen into...

[pandora-kernel.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 23f8d8c..8bb9362 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -6,6 +6,7 @@ config ALPHA
        select HAVE_OPROFILE
        select HAVE_SYSCALL_WRAPPERS
        select HAVE_IRQ_WORK
+       select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
        select HAVE_DMA_ATTRS
        select HAVE_GENERIC_HARDIRQS
@@ -50,7 +51,7 @@ config GENERIC_CMOS_UPDATE
         def_bool y
 
 config GENERIC_GPIO
-       def_bool y
+       bool
 
 config ZONE_DMA
        bool