diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/at91sam9g45_defconfig | 1 | ||||
-rw-r--r-- | arch/avr32/configs/favr-32_defconfig | 1 | ||||
-rw-r--r-- | arch/avr32/configs/merisc_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc5121.dtsi | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig index 5f551b76cb65..18964cdacd68 100644 --- a/arch/arm/configs/at91sam9g45_defconfig +++ b/arch/arm/configs/at91sam9g45_defconfig | |||
@@ -173,7 +173,6 @@ CONFIG_MMC=y | |||
173 | # CONFIG_MMC_BLOCK_BOUNCE is not set | 173 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
174 | CONFIG_SDIO_UART=m | 174 | CONFIG_SDIO_UART=m |
175 | CONFIG_MMC_ATMELMCI=y | 175 | CONFIG_MMC_ATMELMCI=y |
176 | CONFIG_MMC_ATMELMCI_DMA=y | ||
177 | CONFIG_LEDS_ATMEL_PWM=y | 176 | CONFIG_LEDS_ATMEL_PWM=y |
178 | CONFIG_LEDS_GPIO=y | 177 | CONFIG_LEDS_GPIO=y |
179 | CONFIG_LEDS_TRIGGER_TIMER=y | 178 | CONFIG_LEDS_TRIGGER_TIMER=y |
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig index 57788a42ff83..c90fbf6d35bc 100644 --- a/arch/avr32/configs/favr-32_defconfig +++ b/arch/avr32/configs/favr-32_defconfig | |||
@@ -122,7 +122,6 @@ CONFIG_USB_G_SERIAL=m | |||
122 | CONFIG_USB_CDC_COMPOSITE=m | 122 | CONFIG_USB_CDC_COMPOSITE=m |
123 | CONFIG_MMC=y | 123 | CONFIG_MMC=y |
124 | CONFIG_MMC_ATMELMCI=y | 124 | CONFIG_MMC_ATMELMCI=y |
125 | CONFIG_MMC_ATMELMCI_DMA=y | ||
126 | CONFIG_NEW_LEDS=y | 125 | CONFIG_NEW_LEDS=y |
127 | CONFIG_LEDS_CLASS=y | 126 | CONFIG_LEDS_CLASS=y |
128 | CONFIG_LEDS_ATMEL_PWM=m | 127 | CONFIG_LEDS_ATMEL_PWM=m |
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig index 3befab966827..65de4431108c 100644 --- a/arch/avr32/configs/merisc_defconfig +++ b/arch/avr32/configs/merisc_defconfig | |||
@@ -102,7 +102,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y | |||
102 | CONFIG_LOGO=y | 102 | CONFIG_LOGO=y |
103 | CONFIG_MMC=y | 103 | CONFIG_MMC=y |
104 | CONFIG_MMC_ATMELMCI=y | 104 | CONFIG_MMC_ATMELMCI=y |
105 | CONFIG_MMC_ATMELMCI_DMA=y | ||
106 | CONFIG_NEW_LEDS=y | 105 | CONFIG_NEW_LEDS=y |
107 | CONFIG_LEDS_CLASS=y | 106 | CONFIG_LEDS_CLASS=y |
108 | CONFIG_LEDS_ATMEL_PWM=y | 107 | CONFIG_LEDS_ATMEL_PWM=y |
diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi index 2e82d0e71dd3..bd14c00e5146 100644 --- a/arch/powerpc/boot/dts/mpc5121.dtsi +++ b/arch/powerpc/boot/dts/mpc5121.dtsi | |||
@@ -152,6 +152,8 @@ | |||
152 | compatible = "fsl,mpc5121-sdhc"; | 152 | compatible = "fsl,mpc5121-sdhc"; |
153 | reg = <0x1500 0x100>; | 153 | reg = <0x1500 0x100>; |
154 | interrupts = <8 0x8>; | 154 | interrupts = <8 0x8>; |
155 | dmas = <&dma0 30>; | ||
156 | dma-names = "rx-tx"; | ||
155 | }; | 157 | }; |
156 | 158 | ||
157 | i2c@1700 { | 159 | i2c@1700 { |