diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-02-28 18:55:52 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2015-02-28 18:55:52 +0000 |
| commit | e6b799b67d2dc6cc1491f78a1a89decfcaaf656b (patch) | |
| tree | dd0f740942b784e343ef515e1245d982e6776f00 /config-armv7 | |
| parent | e8cacb99801ad1c3dc4740ab7db947026f45cb65 (diff) | |
| download | kernel-e6b799b67d2dc6cc1491f78a1a89decfcaaf656b.tar.gz kernel-e6b799b67d2dc6cc1491f78a1a89decfcaaf656b.tar.xz kernel-e6b799b67d2dc6cc1491f78a1a89decfcaaf656b.zip | |
ARMv7 OMAP updates, fix panda boot
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config-armv7 b/config-armv7 index 4e62e3a79..cae845b40 100644 --- a/config-armv7 +++ b/config-armv7 @@ -100,9 +100,7 @@ CONFIG_OMAP_PACKAGE_CUS=y CONFIG_OMAP2PLUS_MBOX=m CONFIG_OMAP_MBOX_KFIFO_SIZE=256 -CONFIG_OMAP_DM_TIMER=y -CONFIG_OMAP_PM_NOOP=y -CONFIG_DMA_OMAP=y +CONFIG_DMA_OMAP=m CONFIG_OMAP_IOMMU=y CONFIG_HWSPINLOCK_OMAP=m # CONFIG_OMAP3_SDRC_AC_TIMING is not set @@ -116,6 +114,8 @@ CONFIG_GPIO_TWL6040=m CONFIG_GPIO_PCF857X=m CONFIG_I2C_OMAP=m CONFIG_CHARGER_TWL4030=m +CONFIG_CHARGER_ISP1704=m +CONFIG_CHARGER_BQ2415X=m CONFIG_OMAP_WATCHDOG=m CONFIG_TWL4030_CORE=y CONFIG_TWL4030_MADC=m @@ -540,7 +540,7 @@ CONFIG_INPUT_AB8500_PONKEY=m CONFIG_REGULATOR_AB8500=y CONFIG_AB8500_USB=m CONFIG_USB_MUSB_UX500=m -CONFIG_USB_UX500_DMA=y +# CONFIG_USB_UX500_DMA is not set CONFIG_RTC_DRV_AB8500=m CONFIG_PWM_AB8500=m CONFIG_SND_SOC_UX500=m |