1 files changed, 65 insertions, 1 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 962817e49fba..636af2862308 100644
--- 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
@@ -107,6 +140,7 @@ config ACER_WMI
         depends on EXPERIMENTAL
         depends on ACPI
         depends on LEDS_CLASS
+        depends on NEW_LEDS
         depends on BACKLIGHT_CLASS_DEVICE
         depends on SERIO_I8042
         select ACPI_WMI
@@ -127,6 +161,7 @@ config ASUS_LAPTOP
         depends on ACPI
         depends on EXPERIMENTAL && !ACPI_ASUS
         depends on LEDS_CLASS
+        depends on NEW_LEDS
         depends on BACKLIGHT_CLASS_DEVICE
         ---help---
           This is the new Linux driver for Asus laptops. It may also support some
@@ -208,10 +243,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
@@ -311,6 +349,7 @@ config ATMEL_SSC
 config INTEL_MENLOW
         tristate "Thermal Management driver for Intel menlow platform"
         depends on ACPI_THERMAL
+        select THERMAL
         depends on X86
         ---help---
           ACPI thermal management enhancement driver on
@@ -318,6 +357,19 @@ config INTEL_MENLOW
 
           If unsure, say N.
 
+config EEEPC_LAPTOP
+        tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
+        depends on X86
+        depends on ACPI
+        depends on BACKLIGHT_CLASS_DEVICE
+        depends on HWMON
+        depends on EXPERIMENTAL
+        ---help---
+          This driver supports the Fn-Fx keys on Eee PC laptops.
+          It also adds the ability to switch camera/wlan on/off.
+
+          If you have an Eee PC laptop, say Y or M here.
+
 config ENCLOSURE_SERVICES
         tristate "Enclosure Services"
         default n
@@ -327,4 +379,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