diff --git a/drivers/Kconfig b/drivers/Kconfig
index f2eb26efbc..34ea89a139 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -207,19 +207,8 @@ menuconfig SPI
 
 if SPI
 source drivers/spi/Kconfig
-
-menuconfig SPI_EEPROM
-	bool "SPI EEPROM support"
-	default n
-	---help---
-		This directory holds implementations of SPI EEPROM drivers
-
-if SPI_EEPROM
-source drivers/eeprom/Kconfig
 endif
 
-endif # SPI
-
 menuconfig I2S
 	bool "I2S Driver Support"
 	default n
@@ -422,6 +411,16 @@ if MTD
 source drivers/mtd/Kconfig
 endif # MTD
 
+menuconfig EEPROM
+	bool "EEPROM support"
+	default n
+	---help---
+		This directory holds implementations of EEPROM drivers.
+
+if EEPROM
+source drivers/eeprom/Kconfig
+endif
+
 menuconfig NETDEVICES
 	bool "Network Device/PHY Support"
 	default n if !ARCH_HAVE_PHY
diff --git a/drivers/Makefile b/drivers/Makefile
index 229b3d6f63..62d1986ca1 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -52,11 +52,11 @@ VPATH = .
 include analog$(DELIM)Make.defs
 include audio$(DELIM)Make.defs
 include bch$(DELIM)Make.defs
-include eeprom$(DELIM)Make.defs
 include input$(DELIM)Make.defs
 include lcd$(DELIM)Make.defs
 include mmcsd$(DELIM)Make.defs
 include mtd$(DELIM)Make.defs
+include eeprom$(DELIM)Make.defs
 include net$(DELIM)Make.defs
 include pipes$(DELIM)Make.defs
 include power$(DELIM)Make.defs
diff --git a/drivers/eeprom/Kconfig b/drivers/eeprom/Kconfig
index 14c31b3e8e..9d3adc0161 100644
--- a/drivers/eeprom/Kconfig
+++ b/drivers/eeprom/Kconfig
@@ -3,10 +3,11 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+if EEPROM
 config SPI_EE_25XX
 	bool "Microchip 25xxNNN / Atmel AT25NNN EEPROM devices"
 	default n
-	depends on SPI_EEPROM
+	depends on SPI
 	---help---
 		This selection enables support for the Microchip/Atmel SPI EEPROM
 		devices
@@ -18,4 +19,5 @@ config EE25XX_SPIMODE
 	default 0
 	depends on SPI_EE_25XX
 
-endif
+endif # SPI_EE_25XX
+endif # EEPROM
diff --git a/drivers/eeprom/Make.defs b/drivers/eeprom/Make.defs
index d9588c7c68..afbebea625 100644
--- a/drivers/eeprom/Make.defs
+++ b/drivers/eeprom/Make.defs
@@ -33,9 +33,9 @@
 #
 ############################################################################
 
-# Include SPI EEPROM support
+# Include EEPROM support
 
-ifeq ($(CONFIG_SPI_EEPROM),y)
+ifeq ($(CONFIG_EEPROM),y)
 
 # Include the Microchip/Atmel xx25xx driver