ACPI: thinkpad-acpi: fix selects in Kconfig

[pandora-kernel.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 1abc95c..2e21794 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -22,6 +22,39 @@ config ATMEL_PWM
          purposes including software controlled power-efficent backlights
          on LCD displays, motor control, and waveform generation.
 
+config ATMEL_TCLIB
+       bool "Atmel AT32/AT91 Timer/Counter Library"
+       depends on (AVR32 || ARCH_AT91)
+       help
+         Select this if you want a library to allocate the Timer/Counter
+         blocks found on many Atmel processors.  This facilitates using
+         these blocks by different drivers despite processor differences.
+
+config ATMEL_TCB_CLKSRC
+       bool "TC Block Clocksource"
+       depends on ATMEL_TCLIB && GENERIC_TIME
+       default y
+       help
+         Select this to get a high precision clocksource based on a
+         TC block with a 5+ MHz base clock rate.  Two timer channels
+         are combined to make a single 32-bit timer.
+
+         When GENERIC_CLOCKEVENTS is defined, the third timer channel
+         may be used as a clock event device supporting oneshot mode
+         (delays of up to two seconds) based on the 32 KiHz clock.
+
+config ATMEL_TCB_CLKSRC_BLOCK
+       int
+       depends on ATMEL_TCB_CLKSRC
+       prompt "TC Block" if ARCH_AT91RM9200 || ARCH_AT91SAM9260 || CPU_AT32AP700X
+       default 0
+       range 0 1
+       help
+         Some chips provide more than one TC block, so you have the
+         choice of which one to use for the clock framework.  The other
+         TC can be used for other purposes, such as PWM generation and
+         interval timing.
+
 config IBM_ASM
        tristate "Device driver for IBM RSA service processor"
        depends on X86 && PCI && INPUT && EXPERIMENTAL
@@ -108,6 +141,7 @@ config ACER_WMI
        depends on ACPI
        depends on LEDS_CLASS
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on SERIO_I8042
        select ACPI_WMI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
@@ -207,10 +241,13 @@ config SONYPI_COMPAT
 config THINKPAD_ACPI
        tristate "ThinkPad ACPI Laptop Extras"
        depends on X86 && ACPI
+       select BACKLIGHT_LCD_SUPPORT
        select BACKLIGHT_CLASS_DEVICE
        select HWMON
        select NVRAM
-       depends on INPUT
+       select INPUT
+       select NEW_LEDS
+       select LEDS_CLASS
        ---help---
          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video
@@ -258,6 +295,23 @@ config THINKPAD_ACPI_BAY
 
          If you are not sure, say Y here.
 
+config THINKPAD_ACPI_VIDEO
+       bool "Video output control support"
+       depends on THINKPAD_ACPI
+       default y
+       ---help---
+         Allows the thinkpad_acpi driver to provide an interface to control
+         the various video output ports.
+
+         This feature often won't work well, depending on ThinkPad model,
+         display state, video output devices in use, whether there is a X
+         server running, phase of the moon, and the current mood of
+         Schroedinger's cat.  If you can use X.org's RandR to control
+         your ThinkPad's video output ports instead of this feature,
+         don't think twice: do it and say N here to save some memory.
+
+         If you are not sure, say Y here.
+
 config THINKPAD_ACPI_HOTKEY_POLL
        bool "Suport NVRAM polling for hot keys"
        depends on THINKPAD_ACPI
@@ -309,4 +363,16 @@ config ENCLOSURE_SERVICES
          driver (SCSI/ATA) which supports enclosures
          or a SCSI enclosure device (SES) to use these services.
 
+config SGI_XP
+       tristate "Support communication between SGI SSIs"
+       depends on IA64_GENERIC || IA64_SGI_SN2
+       select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
+       select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
+       ---help---
+         An SGI machine can be divided into multiple Single System
+         Images which act independently of each other and have
+         hardware based memory protection from the others.  Enabling
+         this feature will allow for direct communication between SSIs
+         based on a network adapter and DMA messaging.
+
 endif # MISC_DEVICES