diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 11:19:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 11:19:13 -0800 |
| commit | 5e0af24cee56e75d0cb13dc072539acb52f694cf (patch) | |
| tree | 94353a6408b6bf148ad58769d0a040e1c54b1587 /arch/avr32/configs/hammerhead_defconfig | |
| parent | 22056614ee39ef43670814d2000f810901768277 (diff) | |
| parent | 464b500e37a588be69ed9c9c21bca62a578ca66c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 fixes from Hans-Christian Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: favr-32: clk_round_rate() can return a zero upon error
avr32: remove deprecated IRQF_DISABLED
cpufreq_ at32ap-cpufreq.c: Fix section mismatch
avr32: pm: Fix section mismatch
avr32: Kill CONFIG_MTD_PARTITIONS
Diffstat (limited to 'arch/avr32/configs/hammerhead_defconfig')
| -rw-r--r-- | arch/avr32/configs/hammerhead_defconfig | 1 |
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 |