summaryrefslogtreecommitdiffstats
path: root/drivers/misc/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-23 08:17:28 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-23 08:17:28 +0100
commit66a101dda6b26ee566aa9cadcbea904a41d2b268 (patch)
treee03b5d40b7b88bb0a2f432bceba4680086d6d3a1 /drivers/misc/Kconfig
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
parent28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff)
downloadtalos-op-linux-66a101dda6b26ee566aa9cadcbea904a41d2b268.tar.gz
talos-op-linux-66a101dda6b26ee566aa9cadcbea904a41d2b268.zip
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
Diffstat (limited to 'drivers/misc/Kconfig')
-rw-r--r--drivers/misc/Kconfig9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 419c378bd24b..56073199ceba 100644
--- 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
@@ -231,5 +223,6 @@ config DELL_LAPTOP
laptops.
source "drivers/misc/c2port/Kconfig"
+source "drivers/misc/eeprom/Kconfig"
endif # MISC_DEVICES
OpenPOWER on IntegriCloud