From c160b4aab23651039df575458b70a6bf56a786fa Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 6 Aug 2012 13:59:06 -0300 Subject: [PATCH] --- yaml --- r: 331263 b: refs/heads/master c: adfa06dc177f91e07ce6b4c472befc35ea7dc6ab h: refs/heads/master i: 331261: c4ba138336dfdfb0dfaa0b3b059b2721d7128303 331259: b6afd2bb4eaee4c0cd0cd002882aa7233c3f6aa7 331255: 446e740bfda5040dd8ce00da164a64b811d831a7 331247: 6cea9a0c1246970d78ecb07a151976159188fafe 331231: 81ee05362265b2c96eaa207247071c27ced88f49 331199: af61ee1e8d079efb5e5a519238c2fb90e492359d 331135: 15c8905f548f08189a3ef99132b540ea67056087 331007: 52eba6702d4f03fb1351011f52e8b12df096eb16 330751: dbf7d58fbf7b435650df8d62fac8e772c464387e v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/mxs_defconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b2a5b40ed8f5..25812f2eab51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59dfc97c819a6d25e1000c2daf9d84f32c35e1a5 +refs/heads/master: adfa06dc177f91e07ce6b4c472befc35ea7dc6ab diff --git a/trunk/arch/arm/configs/mxs_defconfig b/trunk/arch/arm/configs/mxs_defconfig index e3487e491f9a..4cb61700e65e 100644 --- a/trunk/arch/arm/configs/mxs_defconfig +++ b/trunk/arch/arm/configs/mxs_defconfig @@ -60,6 +60,7 @@ CONFIG_DEVTMPFS=y # CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_BLK_DEV is not set CONFIG_MTD=y +CONFIG_MTD_CHAR=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_NETDEVICES=y @@ -118,12 +119,23 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_MMC=y CONFIG_MMC_MXS=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_STMP=y CONFIG_DMADEVICES=y CONFIG_MXS_DMA=y CONFIG_COMMON_CLK_DEBUG=y +CONFIG_PWM=y +CONFIG_PWM_MXS=y CONFIG_EXT3_FS=y # CONFIG_DNOTIFY is not set CONFIG_FSCACHE=m