Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 4bad588d0e5d6c53499aff9dbdb65dfc390aed35..ba0e88c64e1ef93befa1c6e0f4483845cb88ebb2 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -26,7 +26,7 @@ config INPUT_PCSPKR
 
 config INPUT_SPARCSPKR
        tristate "SPARC Speaker support"
-       depends on PCI && SPARC
+       depends on PCI && SPARC64
        help
          Say Y here if you want the standard Speaker on Sparc PCI systems
          to be used for bells and whistles.
@@ -73,7 +73,7 @@ config INPUT_UINPUT
 
 config HP_SDC_RTC
        tristate "HP SDC Real Time Clock"       
-       depends on GSC
+       depends on GSC || HP300
        select HP_SDC
        help
          Say Y here if you want to support the built-in real time clock