Merge branch 'dell-laptop' into release

diff --combined drivers/misc/Kconfig
index 59f4ba1b7034b8336969a37532066f399993e96f,ba137c8b263ee634e1f40c3198790b2c1c025244..1a7a9fc50ea1019fc74965daf6de40fff65b0f47
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -13,20 -13,6 +13,20 @@@ menuconfig MISC_DEVICE
  
  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
@@@ -187,30 -173,6 +187,30 @@@ config SGI_X
          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
@@@ -248,19 -210,6 +248,6 @@@ config SGI_GRU_DEBU
        This option enables addition debugging code for the SGI GRU driver. If
        you are unsure, say N.
  
- config DELL_LAPTOP
-       tristate "Dell Laptop Extras (EXPERIMENTAL)"
-       depends on X86
-       depends on DCDBAS
-       depends on EXPERIMENTAL
-       depends on BACKLIGHT_CLASS_DEVICE
-       depends on RFKILL
-       depends on POWER_SUPPLY
-       default n
-       ---help---
-       This driver adds support for rfkill and backlight control to Dell
-       laptops.
- 
  config ISL29003
        tristate "Intersil ISL29003 ambient light sensor"
        depends on I2C && SYSFS
@@@ -284,29 -233,8 +271,29 @@@ config EP93XX_PW
          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