misc: Fix bad merge of MPU Kconfig

[linux-2.6.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 4e007c6a4b446695c01980450f3d6b6eb4548bf0..2ebf2c9e934ad9d554f7b7456c12ce259c090095 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -2,24 +2,14 @@
 # Misc strange devices
 #
 
-# This one has to live outside of the MISC_DEVICES conditional,
-# because it may be selected by drivers/platform/x86/hp_accel.
+menu "Misc devices"
+
 config SENSORS_LIS3LV02D
        tristate
        depends on INPUT
        select INPUT_POLLDEV
        default n
 
-menuconfig MISC_DEVICES
-       bool "Misc devices"
-       ---help---
-         Say Y here to get to see options for device drivers from various
-         different categories. This option alone does not add any kernel code.
-
-         If you say N, all options in this submenu will be skipped and disabled.
-
-if MISC_DEVICES
-
 config AD525X_DPOT
        tristate "Analog Devices Digital Potentiometers"
        depends on (I2C || SPI) && SYSFS
@@ -63,7 +53,7 @@ config AD525X_DPOT_SPI
 
 config ATMEL_PWM
        tristate "Atmel AT32/AT91 PWM support"
-       depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
+       depends on HAVE_CLK
        help
          This option enables device driver support for the PWM channels
          on certain Atmel processors.  Pulse Width Modulation is used for
@@ -144,6 +134,20 @@ config PHANTOM
          If you choose to build module, its name will be phantom. If unsure,
          say N here.
 
+config INTEL_MID_PTI
+       tristate "Parallel Trace Interface for MIPI P1149.7 cJTAG standard"
+       depends on PCI
+       default n
+       help
+         The PTI (Parallel Trace Interface) driver directs
+         trace data routed from various parts in the system out
+         through an Intel Penwell PTI port and out of the mobile
+         device for analysis with a debugging tool (Lauterbach or Fido).
+
+         You should select this driver if the target kernel is meant for
+         an Intel Atom (non-netbook) mobile device containing a MIPI
+         P1149.7 standard implementation.
+
 config SGI_IOC4
        tristate "SGI IOC4 Base IO support"
        depends on PCI
@@ -232,8 +236,7 @@ config SGI_XP
 
 config CS5535_MFGPT
        tristate "CS5535/CS5536 Geode Multi-Function General Purpose Timer (MFGPT) support"
-       depends on PCI
-       depends on X86
+       depends on PCI && X86 && MFD_CS5535
        default n
        help
          This driver provides access to MFGPT functionality for other
@@ -379,6 +382,14 @@ config HMC6352
          This driver provides support for the Honeywell HMC6352 compass,
          providing configuration and heading data via sysfs.
 
+config SENSORS_NCT1008
+       tristate "ON Semiconductor Temperature Sensor"
+       default n
+       depends on I2C
+       help
+        Say yes here if you wish to include the ON Semiconductor
+        NCT1008 Temperature sensor.
+
 config EP93XX_PWM
        tristate "EP93xx PWM support"
        depends on ARCH_EP93XX
@@ -459,7 +470,7 @@ config BMP085
          module will be called bmp085.
 
 config PCH_PHUB
-       tristate "PCH Packet Hub of Intel Topcliff / OKI SEMICONDUCTOR ML7213"
+       tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"
        depends on PCI
        help
          This driver is for PCH(Platform controller Hub) PHUB(Packet Hub) of
@@ -467,19 +478,60 @@ config PCH_PHUB
          processor. The Topcliff has MAC address and Option ROM data in SROM.
          This driver can access MAC address and Option ROM data in SROM.
 
-         This driver also can be used for OKI SEMICONDUCTOR's ML7213 which is
-         for IVI(In-Vehicle Infotainment) use.
-         ML7213 is companion chip for Intel Atom E6xx series.
-         ML7213 is completely compatible for Intel EG20T PCH.
+         This driver also can be used for LAPIS Semiconductor's IOH,
+         ML7213/ML7223/ML7831.
+         ML7213 which is for IVI(In-Vehicle Infotainment) use.
+         ML7223 IOH is for MP(Media Phone) use.
+         ML7831 IOH is for general purpose use.
+         ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
+         ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
 
          To compile this driver as a module, choose M here: the module will
          be called pch_phub.
 
+config USB_SWITCH_FSA9480
+       tristate "FSA9480 USB Switch"
+       depends on I2C
+       help
+         The FSA9480 is a USB port accessory detector and switch.
+         The FSA9480 is fully controlled using I2C and enables USB data,
+         stereo and mono audio, video, microphone and UART data to use
+         a common connector port.
+
+config MAX8997_MUIC
+       tristate "MAX8997 MUIC Support"
+       depends on MFD_MAX8997
+       help
+         If you say yes here you get support for the MUIC device of
+         Maxim MAX8997 PMIC.
+         The MAX8997 MUIC is a USB port accessory detector and switch.
+
+config BCM4329_RFKILL
+       bool "Enable BCM4329 RFKILL driver"
+       default n
+       ---help---
+       Adds BCM4329 RFKILL driver for Broadcom BCM4329 chipset
+
+config TEGRA_CRYPTO_DEV
+       bool "Device node to access tegra aes hardware"
+       ---help---
+       Dev node /dev/tegra-crypto in order to get access to tegra aes
+       hardware from user space
+
+config MAX1749_VIBRATOR
+       bool "MAX1749 vibrator device driver"
+       depends on ANDROID_TIMED_OUTPUT
+       default n
+       ---help---
+       Adds a timed output vibrator device node for MAX1749 vibrator motor
+
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
 source "drivers/misc/iwmc3200top/Kconfig"
 source "drivers/misc/ti-st/Kconfig"
 source "drivers/misc/lis3lv02d/Kconfig"
-
-endif # MISC_DEVICES
+source "drivers/misc/carma/Kconfig"
+source "drivers/misc/altera-stapl/Kconfig"
+source "drivers/misc/inv_mpu/Kconfig"
+endmenu