git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
input
/
misc
/
Kconfig
diff --git
a/drivers/input/misc/Kconfig
b/drivers/input/misc/Kconfig
index
26f9ed6
..
bb934e6
100644
(file)
--- a/
drivers/input/misc/Kconfig
+++ b/
drivers/input/misc/Kconfig
@@
-1,9
+1,8
@@
#
# Input misc drivers configuration
#
#
# Input misc drivers configuration
#
-config INPUT_MISC
- bool "Misc"
- depends on INPUT
+menuconfig INPUT_MISC
+ bool "Miscellaneous devices"
help
Say Y here, and a list of miscellaneous input drivers will be displayed.
Everything that didn't fit into the other categories is here. This option
help
Say Y here, and a list of miscellaneous input drivers will be displayed.
Everything that didn't fit into the other categories is here. This option
@@
-11,9
+10,11
@@
config INPUT_MISC
If unsure, say Y.
If unsure, say Y.
+if INPUT_MISC
+
config INPUT_PCSPKR
tristate "PC Speaker support"
config INPUT_PCSPKR
tristate "PC Speaker support"
- depends on
(ALPHA || X86 || X86_64 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES) && INPUT && INPUT_MISC
+ depends on
ALPHA || X86 || X86_64 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
help
Say Y here if you want the standard PC Speaker to be used for
bells and whistles.
help
Say Y here if you want the standard PC Speaker to be used for
bells and whistles.
@@
-25,7
+26,7
@@
config INPUT_PCSPKR
config INPUT_SPARCSPKR
tristate "SPARC Speaker support"
config INPUT_SPARCSPKR
tristate "SPARC Speaker support"
- depends on
(SPARC32 || SPARC64) && INPUT && INPUT_MISC && PCI
+ depends on
PCI && (SPARC32 || SPARC64)
help
Say Y here if you want the standard Speaker on Sparc PCI systems
to be used for bells and whistles.
help
Say Y here if you want the standard Speaker on Sparc PCI systems
to be used for bells and whistles.
@@
-37,11
+38,10
@@
config INPUT_SPARCSPKR
config INPUT_M68K_BEEP
tristate "M68k Beeper support"
config INPUT_M68K_BEEP
tristate "M68k Beeper support"
- depends on M68K
&& INPUT && INPUT_MISC
+ depends on M68K
config INPUT_UINPUT
tristate "User level driver support"
config INPUT_UINPUT
tristate "User level driver support"
- depends on INPUT && INPUT_MISC
help
Say Y here if you want to support user level drivers for input
subsystem accessible under char device 10:223 - /dev/input/uinput.
help
Say Y here if you want to support user level drivers for input
subsystem accessible under char device 10:223 - /dev/input/uinput.
@@
-49,3
+49,12
@@
config INPUT_UINPUT
To compile this driver as a module, choose M here: the
module will be called uinput.
To compile this driver as a module, choose M here: the
module will be called uinput.
+config HP_SDC_RTC
+ tristate "HP SDC Real Time Clock"
+ depends on GSC
+ select HP_SDC
+ help
+ Say Y here if you want to support the built-in real time clock
+ of the HP SDC controller.
+
+endif