summaryrefslogtreecommitdiffstats
path: root/arch/avr32/configs/hammerhead_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-28 21:37:03 -0800
committerOlof Johansson <olof@lixom.net>2013-12-28 21:38:16 -0800
commitfe5a365cdb9cc925d5ce86a5bb4509dca57f3894 (patch)
tree8dd536be0e16e86109295142edd1ef1fd18c2e98 /arch/avr32/configs/hammerhead_defconfig
parent4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70 (diff)
parent413541dd66d51f791a0b169d9b9014e4f56be13c (diff)
downloadtalos-op-linux-fe5a365cdb9cc925d5ce86a5bb4509dca57f3894.tar.gz
talos-op-linux-fe5a365cdb9cc925d5ce86a5bb4509dca57f3894.zip
Merge tag 'v3.13-rc5' into next/boards
Need a newer base version to get a regulator fix for Samsung platforms that they enable building in a defconfig. Linux 3.13-rc5
Diffstat (limited to 'arch/avr32/configs/hammerhead_defconfig')
-rw-r--r--arch/avr32/configs/hammerhead_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig
index ba7c31e269cb..18db853386c8 100644
--- a/arch/avr32/configs/hammerhead_defconfig
+++ b/arch/avr32/configs/hammerhead_defconfig
@@ -58,7 +58,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