diff options
| author | Jens Axboe <axboe@kernel.dk> | 2014-01-08 11:32:45 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2014-01-08 11:32:45 -0500 |
| commit | 54a387cb9e600256e50cb9e2209e7e4f06f464de (patch) | |
| tree | 37f2b32b1330f51dbe10ccf4300114c72f7aabdc /arch/avr32/configs/atngw100_evklcd100_defconfig | |
| parent | 8586ea96b4f919a9b38929040bc9ce57c9998fc4 (diff) | |
| parent | 0fec08b4ecfc36fd8a64432343b2964fb86d2675 (diff) | |
Merge branch 'for-3.14/core' into for-3.14/drivers
We need the updated code to make bcache easier to merge.
Diffstat (limited to 'arch/avr32/configs/atngw100_evklcd100_defconfig')
| -rw-r--r-- | arch/avr32/configs/atngw100_evklcd100_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig index 4abcf435d599..1be0ee31bd91 100644 --- a/arch/avr32/configs/atngw100_evklcd100_defconfig +++ b/arch/avr32/configs/atngw100_evklcd100_defconfig | |||
| @@ -61,7 +61,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 61 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 61 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 62 | # CONFIG_FW_LOADER is not set | 62 | # CONFIG_FW_LOADER is not set |
| 63 | CONFIG_MTD=y | 63 | CONFIG_MTD=y |
| 64 | CONFIG_MTD_PARTITIONS=y | ||
| 65 | CONFIG_MTD_CMDLINE_PARTS=y | 64 | CONFIG_MTD_CMDLINE_PARTS=y |
| 66 | CONFIG_MTD_CHAR=y | 65 | CONFIG_MTD_CHAR=y |
| 67 | CONFIG_MTD_BLOCK=y | 66 | CONFIG_MTD_BLOCK=y |