summaryrefslogtreecommitdiffstats
path: root/arch/avr32/configs/atstk1002_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-26 10:31:33 -0800
committerOlof Johansson <olof@lixom.net>2013-12-26 10:31:33 -0800
commit509633c8366a0df239297c89689e87aaf6625781 (patch)
tree887622d77f0f2dc3886f52fdbe3f389df337dca1 /arch/avr32/configs/atstk1002_defconfig
parentbb748890d13232dba4a3975368bfeea6896368ae (diff)
parent319e2e3f63c348a9b66db4667efa73178e18b17d (diff)
downloadblackbird-op-linux-509633c8366a0df239297c89689e87aaf6625781.tar.gz
blackbird-op-linux-509633c8366a0df239297c89689e87aaf6625781.zip
Merge tag 'v3.13-rc4' into next/cleanup
Linux 3.13-rc4
Diffstat (limited to 'arch/avr32/configs/atstk1002_defconfig')
-rw-r--r--arch/avr32/configs/atstk1002_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index bbd5131021a5..2813dd2b9138 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -53,7 +53,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
OpenPOWER on IntegriCloud