diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 17:10:44 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 17:10:44 +0100 |
| commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
| tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /arch/avr32/configs/atstk1002_defconfig | |
| parent | Input: xpad - add new USB IDs for Logitech F310 and F710 (diff) | |
| parent | Input: wacom - add support for DTU-1031 (diff) | |
| download | linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.xz linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.zip | |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'arch/avr32/configs/atstk1002_defconfig')
| -rw-r--r-- | arch/avr32/configs/atstk1002_defconfig | 1 |
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 |