diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-01-26 15:19:54 -0500 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-01-26 15:19:54 -0500 |
| commit | 0eb6da20681db9b5d5769d3e1aca877f4a77d8fb (patch) | |
| tree | da9541a1df5ec189af37a5cb22b548534ed8c064 | |
| parent | e51d565ff6bb1cedc10568425511badf0633a212 (diff) | |
eeprom: Move 93cx6 eeprom driver to /drivers/misc/eeprom
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
| -rw-r--r-- | drivers/misc/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/eeprom/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/misc/eeprom/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/eeprom/eeprom_93cx6.c (renamed from drivers/misc/eeprom_93cx6.c) | 0 |
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 6c9cd9d30087..56073199ceba 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -87,14 +87,6 @@ config PHANTOM | |||
| 87 | If you choose to build module, its name will be phantom. If unsure, | 87 | If you choose to build module, its name will be phantom. If unsure, |
| 88 | say N here. | 88 | say N here. |
| 89 | 89 | ||
| 90 | config EEPROM_93CX6 | ||
| 91 | tristate "EEPROM 93CX6 support" | ||
| 92 | ---help--- | ||
| 93 | This is a driver for the EEPROM chipsets 93c46 and 93c66. | ||
| 94 | The driver supports both read as well as write commands. | ||
| 95 | |||
| 96 | If unsure, say N. | ||
| 97 | |||
| 98 | config SGI_IOC4 | 90 | config SGI_IOC4 |
| 99 | tristate "SGI IOC4 Base IO support" | 91 | tristate "SGI IOC4 Base IO support" |
| 100 | depends on PCI | 92 | depends on PCI |
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 0ec23203c994..bc1199830554 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -13,7 +13,6 @@ obj-$(CONFIG_TIFM_CORE) += tifm_core.o | |||
| 13 | obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o | 13 | obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o |
| 14 | obj-$(CONFIG_PHANTOM) += phantom.o | 14 | obj-$(CONFIG_PHANTOM) += phantom.o |
| 15 | obj-$(CONFIG_SGI_IOC4) += ioc4.o | 15 | obj-$(CONFIG_SGI_IOC4) += ioc4.o |
| 16 | obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o | ||
| 17 | obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o | 16 | obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o |
| 18 | obj-$(CONFIG_KGDB_TESTS) += kgdbts.o | 17 | obj-$(CONFIG_KGDB_TESTS) += kgdbts.o |
| 19 | obj-$(CONFIG_SGI_XP) += sgi-xp/ | 18 | obj-$(CONFIG_SGI_XP) += sgi-xp/ |
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig index 5bf3c92d7162..62aae334ee68 100644 --- a/drivers/misc/eeprom/Kconfig +++ b/drivers/misc/eeprom/Kconfig | |||
| @@ -48,4 +48,12 @@ config SENSORS_EEPROM | |||
| 48 | This driver can also be built as a module. If so, the module | 48 | This driver can also be built as a module. If so, the module |
| 49 | will be called eeprom. | 49 | will be called eeprom. |
| 50 | 50 | ||
| 51 | config EEPROM_93CX6 | ||
| 52 | tristate "EEPROM 93CX6 support" | ||
| 53 | help | ||
| 54 | This is a driver for the EEPROM chipsets 93c46 and 93c66. | ||
| 55 | The driver supports both read as well as write commands. | ||
| 56 | |||
| 57 | If unsure, say N. | ||
| 58 | |||
| 51 | endmenu | 59 | endmenu |
diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile index a4fb5cf8ffe6..3b7af6df79a7 100644 --- a/drivers/misc/eeprom/Makefile +++ b/drivers/misc/eeprom/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | obj-$(CONFIG_AT24) += at24.o | 1 | obj-$(CONFIG_AT24) += at24.o |
| 2 | obj-$(CONFIG_SPI_AT25) += at25.o | 2 | obj-$(CONFIG_SPI_AT25) += at25.o |
| 3 | obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o | 3 | obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o |
| 4 | obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o | ||
diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c index 15b1780025c8..15b1780025c8 100644 --- a/drivers/misc/eeprom_93cx6.c +++ b/drivers/misc/eeprom/eeprom_93cx6.c | |||
