Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 419c378bd24b334d5645fa6a35ef5a3b8c158dd0..920fa20622e0e7986c105cf53fef6fb196493862 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -87,14 +87,6 @@ config PHANTOM
          If you choose to build module, its name will be phantom. If unsure,
          say N here.
 
-config EEPROM_93CX6
-       tristate "EEPROM 93CX6 support"
-       ---help---
-         This is a driver for the EEPROM chipsets 93c46 and 93c66.
-         The driver supports both read as well as write commands.
-
-         If unsure, say N.
-
 config SGI_IOC4
        tristate "SGI IOC4 Base IO support"
        depends on PCI
@@ -158,6 +150,20 @@ config ATMEL_SSC
 
          If unsure, say N.
 
+config OMAP_STI
+       bool "Serial Trace Interface support"
+       depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX
+       default n
+       help
+         Serial Trace Interface. The protocols suported for OMAP1/2/3 are
+         STI/CSTI/XTIv2 correspondingly.
+
+config OMAP_STI_CONSOLE
+       bool "STI console support"
+       depends on OMAP_STI
+       help
+         This enables a console driver by way of STI/XTI.
+
 config ENCLOSURE_SERVICES
        tristate "Enclosure Services"
        default n
@@ -231,5 +237,6 @@ config DELL_LAPTOP
        laptops.
 
 source "drivers/misc/c2port/Kconfig"
+source "drivers/misc/eeprom/Kconfig"
 
 endif # MISC_DEVICES