7 files changed, 32 insertions, 27 deletions

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index b9bef04b7be4..b58e77056b2e 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -16,32 +16,6 @@ config DS1682
           This driver can also be built as a module.  If so, the module
           will be called ds1682.
 
-config AT24
-        tristate "EEPROMs from most vendors"
-        depends on SYSFS && EXPERIMENTAL
-        help
-          Enable this driver to get read/write support to most I2C EEPROMs,
-          after you configure the driver to know about each EEPROM on
-          your target board.  Use these generic chip names, instead of
-          vendor-specific ones like at24c64 or 24lc02:
-
-             24c00, 24c01, 24c02, spd (readonly 24c02), 24c04, 24c08,
-             24c16, 24c32, 24c64, 24c128, 24c256, 24c512, 24c1024
-
-          Unless you like data loss puzzles, always be sure that any chip
-          you configure as a 24c32 (32 kbit) or larger is NOT really a
-          24c16 (16 kbit) or smaller, and vice versa. Marking the chip
-          as read-only won't help recover from this. Also, if your chip
-          has any software write-protect mechanism you may want to review the
-          code to make sure this driver won't turn it on by accident.
-
-          If you use this with an SMBus adapter instead of an I2C adapter,
-          full functionality is not available.  Only smaller devices are
-          supported (24c16 and below, max 4 kByte).
-
-          This driver can also be built as a module.  If so, the module
-          will be called at24.
-
 config SENSORS_EEPROM
         tristate "EEPROM reader"
         depends on EXPERIMENTAL
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 00fcb5193ac2..5c14776eb76a 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -11,7 +11,6 @@
 #
 
 obj-$(CONFIG_DS1682)            += ds1682.o
-obj-$(CONFIG_AT24)              += at24.o
 obj-$(CONFIG_SENSORS_EEPROM)    += eeprom.o
 obj-$(CONFIG_SENSORS_MAX6875)   += max6875.o
 obj-$(CONFIG_SENSORS_PCA9539)   += pca9539.o
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 419c378bd24b..6c9cd9d30087 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -231,5 +231,6 @@ config DELL_LAPTOP
         laptops.
 
 source "drivers/misc/c2port/Kconfig"
+source "drivers/misc/eeprom/Kconfig"
 
 endif # MISC_DEVICES
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index d5749a7bc777..0ec23203c994 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -20,3 +20,4 @@ obj-$(CONFIG_SGI_XP)		+= sgi-xp/
 obj-$(CONFIG_SGI_GRU)           += sgi-gru/
 obj-$(CONFIG_HP_ILO)            += hpilo.o
 obj-$(CONFIG_C2PORT)            += c2port/
+obj-y                           += eeprom/
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig
new file mode 100644
index 000000000000..0b21778b7d13
--- /dev/null
+++ b/drivers/misc/eeprom/Kconfig
@@ -0,0 +1,29 @@
+menu "EEPROM support"
+
+config AT24
+        tristate "I2C EEPROMs from most vendors"
+        depends on I2C && SYSFS && EXPERIMENTAL
+        help
+          Enable this driver to get read/write support to most I2C EEPROMs,
+          after you configure the driver to know about each EEPROM on
+          your target board.  Use these generic chip names, instead of
+          vendor-specific ones like at24c64 or 24lc02:
+
+             24c00, 24c01, 24c02, spd (readonly 24c02), 24c04, 24c08,
+             24c16, 24c32, 24c64, 24c128, 24c256, 24c512, 24c1024
+
+          Unless you like data loss puzzles, always be sure that any chip
+          you configure as a 24c32 (32 kbit) or larger is NOT really a
+          24c16 (16 kbit) or smaller, and vice versa. Marking the chip
+          as read-only won't help recover from this. Also, if your chip
+          has any software write-protect mechanism you may want to review the
+          code to make sure this driver won't turn it on by accident.
+
+          If you use this with an SMBus adapter instead of an I2C adapter,
+          full functionality is not available.  Only smaller devices are
+          supported (24c16 and below, max 4 kByte).
+
+          This driver can also be built as a module.  If so, the module
+          will be called at24.
+
+endmenu
diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile
new file mode 100644
index 000000000000..72cd478eb53f
--- /dev/null
+++ b/drivers/misc/eeprom/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_AT24)              += at24.o
diff --git a/drivers/i2c/chips/at24.c b/drivers/misc/eeprom/at24.c
index d4775528abc6..d4775528abc6 100644
--- a/drivers/i2c/chips/at24.c
+++ b/drivers/misc/eeprom/at24.c