diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-05-29 01:20:15 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-07-09 15:13:34 +0200 |
| commit | 67c2b145cd5e3f74a901164d04d9ae19b1462906 (patch) | |
| tree | d671af85dd4948b10f1080ffb9ea1623909bf52b /arch/avr32/configs/merisc_defconfig | |
| parent | cadd94a31fd0c8491e68829de081bd601d5876d5 (diff) | |
avr32: update defconfig to use the generic PWM framework
Now that all boards have switched to the generic PWM framework, update the
defconfigs to use it.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/avr32/configs/merisc_defconfig')
| -rw-r--r-- | arch/avr32/configs/merisc_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig index 91df6b2986be..b9ef4cc85d08 100644 --- a/arch/avr32/configs/merisc_defconfig +++ b/arch/avr32/configs/merisc_defconfig @@ -55,7 +55,6 @@ CONFIG_MTD_ABSENT=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_BLOCK2MTD=y CONFIG_BLK_DEV_LOOP=y -CONFIG_ATMEL_PWM=y CONFIG_ATMEL_SSC=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y @@ -103,12 +102,14 @@ CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y -CONFIG_LEDS_ATMEL_PWM=y +CONFIG_LEDS_PWM=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set CONFIG_RTC_DRV_PCF8563=y CONFIG_DMADEVICES=y CONFIG_UIO=y +CONFIG_PWM=y +CONFIG_PWM_ATMEL=m CONFIG_EXT2_FS=y # CONFIG_DNOTIFY is not set CONFIG_FUSE_FS=y |