Merge branch 'salted-string-hash'

[deliverable/linux.git] / arch / arm / mach-davinci / devices-da8xx.c

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 725e693639d24a71046f63348515e3457d1347c4..add3771d38f640196a32b5be1deaf329de4dc329 100644 (file)
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -751,16 +751,6 @@ static struct resource da8xx_mmcsd0_resources[] = {
                .end    = IRQ_DA8XX_MMCSDINT0,
                .flags  = IORESOURCE_IRQ,
        },
-       {               /* DMA RX */
-               .start  = DA8XX_DMA_MMCSD0_RX,
-               .end    = DA8XX_DMA_MMCSD0_RX,
-               .flags  = IORESOURCE_DMA,
-       },
-       {               /* DMA TX */
-               .start  = DA8XX_DMA_MMCSD0_TX,
-               .end    = DA8XX_DMA_MMCSD0_TX,
-               .flags  = IORESOURCE_DMA,
-       },
 };
 
 static struct platform_device da8xx_mmcsd0_device = {
@@ -788,16 +778,6 @@ static struct resource da850_mmcsd1_resources[] = {
                .end    = IRQ_DA850_MMCSDINT0_1,
                .flags  = IORESOURCE_IRQ,
        },
-       {               /* DMA RX */
-               .start  = DA850_DMA_MMCSD1_RX,
-               .end    = DA850_DMA_MMCSD1_RX,
-               .flags  = IORESOURCE_DMA,
-       },
-       {               /* DMA TX */
-               .start  = DA850_DMA_MMCSD1_TX,
-               .end    = DA850_DMA_MMCSD1_TX,
-               .flags  = IORESOURCE_DMA,
-       },
 };
 
 static struct platform_device da850_mmcsd1_device = {