From: Vaibhav Hiremath Date: Thu, 15 Dec 2011 16:01:04 +0000 (+0530) Subject: Merge to hwmod data patch X-Git-Url: https://git.ti.com/gitweb?p=sitara-epos%2Fsitara-epos-kernel.git;a=commitdiff_plain;h=4660e92288baef296e4e89c23dc743d4727034bd Merge to hwmod data patch --- diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c index 5663d133e430..9dc1f5741de2 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@ -1186,12 +1186,6 @@ static struct omap_hwmod_dma_info am33xx_mmc2_edma_reqs[] = { { .dma_req = -1 } }; -static struct omap_hwmod_dma_info am33xx_mmc2_edma_reqs[] = { - { .name = "tx", .dma_req = AM33XX_DMA_MMCHS2_W, }, - { .name = "rx", .dma_req = AM33XX_DMA_MMCHS2_R, }, - { .dma_req = -1 } -}; - static struct omap_hwmod_addr_space am33xx_mmc2_addr_space[] = { { .pa_start = AM33XX_MMC2_BASE,