diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-31 13:59:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-31 13:59:55 +0100 |
| commit | 68066bb378a0504439e046cdb55d88362eb6379d (patch) | |
| tree | 0b60f72ddf7108a63dd4db617b42e07fbae5346d /arch/avr32/configs/atngw100_defconfig | |
| parent | spi: dw: fix memory leak on error path (diff) | |
| parent | Linux 3.13-rc6 (diff) | |
| download | linux-68066bb378a0504439e046cdb55d88362eb6379d.tar.xz linux-68066bb378a0504439e046cdb55d88362eb6379d.zip | |
Merge tag 'v3.13-rc6' into spi-dw
To resolve trivial overlaps with fixes.
Linux 3.13-rc6
Diffstat (limited to 'arch/avr32/configs/atngw100_defconfig')
| -rw-r--r-- | arch/avr32/configs/atngw100_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig index d5aff36ade92..4733e38e7ae6 100644 --- a/arch/avr32/configs/atngw100_defconfig +++ b/arch/avr32/configs/atngw100_defconfig @@ -59,7 +59,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 |