diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 11:40:28 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 18:42:40 +0000 |
commit | dcea83adc666061864b82c96e059dffe7268b512 (patch) | |
tree | 4882086842f53bee3f6c655e6a3283effd3fbdff /drivers/net | |
parent | c72e005b099302b3c6bee8381396199b77b6dd4f (diff) | |
download | linux-stable-dcea83adc666061864b82c96e059dffe7268b512.tar.gz linux-stable-dcea83adc666061864b82c96e059dffe7268b512.tar.bz2 linux-stable-dcea83adc666061864b82c96e059dffe7268b512.zip |
[ARM] Hide ISA DMA API when ISA_DMA_API is unset
When ISA_DMA_API is unset, we're not implementing the ISA DMA API,
so there's no point in publishing the prototypes via asm/dma.h, nor
including the machine dependent parts of that API.
This allows us to remove a lot of mach/dma.h files which don't contain
any useful code. Unfortunately though, some platforms put their own
private non-ISA definitions into mach/dma.h, so we leave these behind
and fix the appropriate #include statments.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/smc91x.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 50b839da140e..37424f01ebee 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c @@ -22,7 +22,7 @@ #include <net/irda/wrapper.h> #include <net/irda/irda_device.h> -#include <asm/dma.h> +#include <mach/dma.h> #include <mach/irda.h> #include <mach/hardware.h> #include <mach/pxa-regs.h> diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 22576e0a6d18..37e2cb4f4f88 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -527,7 +527,7 @@ struct smc_local { * as RX which can overrun memory and lose packets. */ #include <linux/dma-mapping.h> -#include <asm/dma.h> +#include <mach/dma.h> #include <mach/hardware.h> #include <mach/pxa-regs.h> |