gru: fix bug in exception handling

[safe/jmp/linux-2.6] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 7a1e948..59f4ba1 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -13,6 +13,20 @@ menuconfig MISC_DEVICES
 
 if MISC_DEVICES
 
+config AD525X_DPOT
+       tristate "Analog Devices AD525x Digital Potentiometers"
+       depends on I2C && SYSFS
+       help
+         If you say yes here, you get support for the Analog Devices
+         AD5258, AD5259, AD5251, AD5252, AD5253, AD5254 and AD5255
+         digital potentiometer chips.
+
+         See Documentation/misc-devices/ad525x_dpot.txt for the
+         userspace interface.
+
+         This driver can also be built as a module.  If so, the module
+         will be called ad525x_dpot.
+
 config ATMEL_PWM
        tristate "Atmel AT32/AT91 PWM support"
        depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
@@ -165,7 +179,7 @@ config SGI_XP
        depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
        select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
        select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
-       select SGI_GRU if (IA64_GENERIC || IA64_SGI_UV || X86_64) && SMP
+       select SGI_GRU if X86_64 && SMP
        ---help---
          An SGI machine can be divided into multiple Single System
          Images which act independently of each other and have
@@ -173,6 +187,30 @@ config SGI_XP
          this feature will allow for direct communication between SSIs
          based on a network adapter and DMA messaging.
 
+config CS5535_MFGPT
+       tristate "CS5535/CS5536 Geode Multi-Function General Purpose Timer (MFGPT) support"
+       depends on PCI
+       depends on X86
+       default n
+       help
+         This driver provides access to MFGPT functionality for other
+         drivers that need timers.  MFGPTs are available in the CS5535 and
+         CS5536 companion chips that are found in AMD Geode and several
+         other platforms.  They have a better resolution and max interval
+         than the generic PIT, and are suitable for use as high-res timers.
+         You probably don't want to enable this manually; other drivers that
+         make use of it should enable it.
+
+config CS5535_MFGPT_DEFAULT_IRQ
+       int
+       default 7
+       help
+         MFGPTs on the CS5535 require an interrupt.  The selected IRQ
+         can be overridden as a module option as well as by driver that
+         use the cs5535_mfgpt_ API; however, different architectures might
+         want to use a different IRQ by default.  This is here for
+         architectures to set as necessary.
+
 config HP_ILO
        tristate "Channel interface driver for HP iLO/iLO2 processor"
        depends on PCI
@@ -189,7 +227,7 @@ config HP_ILO
 
 config SGI_GRU
        tristate "SGI GRU driver"
-       depends on (X86_UV || IA64_SGI_UV || IA64_GENERIC) && SMP
+       depends on X86_UV && SMP
        default n
        select MMU_NOTIFIER
        ---help---
@@ -223,7 +261,52 @@ config DELL_LAPTOP
        This driver adds support for rfkill and backlight control to Dell
        laptops.
 
+config ISL29003
+       tristate "Intersil ISL29003 ambient light sensor"
+       depends on I2C && SYSFS
+       help
+         If you say yes here you get support for the Intersil ISL29003
+         ambient light sensor.
+
+         This driver can also be built as a module.  If so, the module
+         will be called isl29003.
+
+config EP93XX_PWM
+       tristate "EP93xx PWM support"
+       depends on ARCH_EP93XX
+       help
+         This option enables device driver support for the PWM channels
+         on the Cirrus EP93xx processors.  The EP9307 chip only has one
+         PWM channel all the others have two, the second channel is an
+         alternate function of the EGPIO14 pin.  A sysfs interface is
+         provided to control the PWM channels.
+
+         To compile this driver as a module, choose M here: the module will
+         be called ep93xx_pwm.
+
+config DS1682
+       tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for Dallas Semiconductor
+         DS1682 Total Elapsed Time Recorder.
+
+         This driver can also be built as a module.  If so, the module
+         will be called ds1682.
+
+config TI_DAC7512
+       tristate "Texas Instruments DAC7512"
+       depends on SPI && SYSFS
+       help
+         If you say yes here you get support for the Texas Instruments
+         DAC7512 16-bit digital-to-analog converter.
+
+         This driver can also be built as a module. If so, the module
+         will be calles ti_dac7512.
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
+source "drivers/misc/cb710/Kconfig"
+source "drivers/misc/iwmc3200top/Kconfig"
 
 endif # MISC_DEVICES