diff options
| author | Anna Persson <anna.m.persson@stericsson.com> | 2010-04-06 15:09:22 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:44:29 -0600 |
| commit | d648b31b5123598cdbe56d4f733ea70fb28c3d0b (patch) | |
| tree | c6d7050b423e55139b0a02f409775f63a7a08312 /arch/arm/configs | |
| parent | 330d7579b468ad29ec9f95850b068b57a7110ec5 (diff) | |
Fixed merge error for DMA and B2R2
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mop500_power_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/mop500_power_defconfig b/arch/arm/configs/mop500_power_defconfig index 339c9847999..4df6a3eb43a 100644 --- a/arch/arm/configs/mop500_power_defconfig +++ b/arch/arm/configs/mop500_power_defconfig @@ -984,7 +984,7 @@ CONFIG_FB_MCDE=y CONFIG_FB_MCDE_MULTIBUFFER=y CONFIG_FB_HDMI=y # CONFIG_FB_ARMCLCD is not set -# CONFIG_FB_B2R2 is not set +CONFIG_FB_B2R2=y # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set @@ -1176,8 +1176,8 @@ CONFIG_MMC_U8500=y CONFIG_U8500_MMC_POLL=y # CONFIG_U8500_MMC_INTR is not set CONFIG_U8500_SDIO=y -CONFIG_U8500_SDIO_DMA=y -# CONFIG_U8500_SDIO_POLL is not set +# CONFIG_U8500_SDIO_DMA is not set +CONFIG_U8500_SDIO_POLL=y # CONFIG_U8500_SDIO_INTR is not set CONFIG_U8500_SDIO_CARD_IRQ=y # CONFIG_MEMSTICK is not set |