diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 11:01:51 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 11:01:51 (GMT) |
commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
tree | fc2efb59d627135ea2199a8a68415b162646b121 /drivers/misc/Kconfig | |
parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
download | linux-fsl-qoriq-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.tar.xz |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'drivers/misc/Kconfig')
-rw-r--r-- | drivers/misc/Kconfig | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index abcb845..396d935 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 |