diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 16:43:11 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 16:43:11 +0200 |
| commit | 3c373f9983f5531c10c29ae1e3136371c8949140 (patch) | |
| tree | 56649c7c898b89afe2e2dc3bfd5336231d3e2da6 /arch/arm/mach-omap2/devices.c | |
| parent | 0a15e0b5b9342fd7fb3f40b24872c174b0e402ea (diff) | |
| parent | e2081f96ba1be3aa22a44daec82af9b226a6d7d6 (diff) | |
| download | linux-stable-3c373f9983f5531c10c29ae1e3136371c8949140.tar.gz linux-stable-3c373f9983f5531c10c29ae1e3136371c8949140.tar.bz2 linux-stable-3c373f9983f5531c10c29ae1e3136371c8949140.zip | |
Merge tag 'omap-for-v3.11/dma-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
Non-critical omap DMA fixes and removal of unused legacy code.
* tag 'omap-for-v3.11/dma-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP1: Remove dma.h
ARM: OMAP1: Remove legacy irda.h and irda setup from board files
ARM: OMAP1: Remove duplicated DMA channel definitions
ARM: OMAP1: Remove McBSP DMA channel definitions
ARM: OMAP2+: Remove dma.h
ARM: OMAP2+: hwmod: Remove remaining DMA channel definitions
ARM: OMAP2+: Remove duplicated DMA channel definitions
ARM: OMAP2+: Remove AES crypto device DMA channel definitions
ARM: OMAP: dma: Remove the erroneous freeing of platform data
ARM: OMAP: dma: Fix the dma_chan_link_map init order
ARM: OMAP: dma: Remove the wrong dev_id check
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 721da484d8ec..f874a3da8917 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -37,7 +37,6 @@ #include "mux.h" #include "control.h" #include "devices.h" -#include "dma.h" #define L3_MODULES_MAX_LEN 12 #define L3_MODULES 3 |