summaryrefslogtreecommitdiff
path: root/arch/mips/configs/rbtx49xx_defconfig
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-03-09 16:21:07 +0300
committerEric Miao <eric.miao@marvell.com>2009-03-09 16:21:07 +0300
commitabcea2c322cef559ef2f108b4763d107a5ccc37f (patch)
tree5fec7fec372f9bdb70703f6c77bfc49cda945442 /arch/mips/configs/rbtx49xx_defconfig
parent8118aea23c328fd4913b325af53fda9d530b1d56 (diff)
parent6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff)
downloadlinux-abcea2c322cef559ef2f108b4763d107a5ccc37f.tar.xz
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'arch/mips/configs/rbtx49xx_defconfig')
-rw-r--r--arch/mips/configs/rbtx49xx_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig
index c7c0864b8ce9..83d5c58662c8 100644
--- a/arch/mips/configs/rbtx49xx_defconfig
+++ b/arch/mips/configs/rbtx49xx_defconfig
@@ -522,7 +522,7 @@ CONFIG_SPI_TXX9=y
#
# SPI Protocol Masters
#
-CONFIG_SPI_AT25=y
+CONFIG_EEPROM_AT25=y
# CONFIG_SPI_TLE62X0 is not set
CONFIG_HAVE_GPIO_LIB=y