aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-02-15 03:05:32 -0500
committerArnd Bergmann <arnd@arndb.de>2014-02-28 11:46:40 -0500
commitcf460cde7c72283708cd494cf7feb4203f72c748 (patch)
treeb00ab271ce10223f3b88a4e6db6108c175346574
parent32c6c01b0e58c38c4f4256091633f6b342987e28 (diff)
ARM: clps711x: Update defconfig
This updates the CLPS711X defconfig to the thing saved by savedefconfig. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/clps711x_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/clps711x_defconfig b/arch/arm/configs/clps711x_defconfig
index 9e8c8316d6b0..0facf9da047c 100644
--- a/arch/arm/configs/clps711x_defconfig
+++ b/arch/arm/configs/clps711x_defconfig
@@ -15,7 +15,6 @@ CONFIG_ARCH_CDB89712=y
15CONFIG_ARCH_CLEP7312=y 15CONFIG_ARCH_CLEP7312=y
16CONFIG_ARCH_EDB7211=y 16CONFIG_ARCH_EDB7211=y
17CONFIG_ARCH_P720T=y 17CONFIG_ARCH_P720T=y
18CONFIG_ARCH_FORTUNET=y
19CONFIG_AEABI=y 18CONFIG_AEABI=y
20CONFIG_ZBOOT_ROM_TEXT=0x0 19CONFIG_ZBOOT_ROM_TEXT=0x0
21CONFIG_ZBOOT_ROM_BSS=0x0 20CONFIG_ZBOOT_ROM_BSS=0x0
@@ -27,7 +26,6 @@ CONFIG_INET=y
27# CONFIG_IPV6 is not set 26# CONFIG_IPV6 is not set
28CONFIG_IRDA=y 27CONFIG_IRDA=y
29CONFIG_IRTTY_SIR=y 28CONFIG_IRTTY_SIR=y
30CONFIG_EP7211_DONGLE=y
31# CONFIG_WIRELESS is not set 29# CONFIG_WIRELESS is not set
32CONFIG_MTD=y 30CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
@@ -58,6 +56,7 @@ CONFIG_CS89x0_PLATFORM=y
58# CONFIG_INPUT is not set 56# CONFIG_INPUT is not set
59# CONFIG_SERIO is not set 57# CONFIG_SERIO is not set
60# CONFIG_VT is not set 58# CONFIG_VT is not set
59CONFIG_SERIAL_CLPS711X=y
61CONFIG_SERIAL_CLPS711X_CONSOLE=y 60CONFIG_SERIAL_CLPS711X_CONSOLE=y
62# CONFIG_HW_RANDOM is not set 61# CONFIG_HW_RANDOM is not set
63CONFIG_I2C=y 62CONFIG_I2C=y