diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-19 16:56:10 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-19 16:56:10 +0400 |
| commit | 3331e924e7c5b98d245531b181551cb2a7380d0e (patch) | |
| tree | 25c4432afd79bedc1e8941415166a5cef0c168fb /arch/avr32/configs/favr-32_defconfig | |
| parent | fd8526ad14c182605e42b64646344b95befd9f94 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| download | linux-3331e924e7c5b98d245531b181551cb2a7380d0e.tar.xz | |
Merge tag 'v3.13-rc4' into x86/mm
Pick up the latest fixes before applying new patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/avr32/configs/favr-32_defconfig')
| -rw-r--r-- | arch/avr32/configs/favr-32_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig index c90fbf6d35bc..07bed3f7eb5e 100644 --- a/arch/avr32/configs/favr-32_defconfig +++ b/arch/avr32/configs/favr-32_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 |