aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-29 06:40:28 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-29 13:42:40 -0500
commitdcea83adc666061864b82c96e059dffe7268b512 (patch)
tree4882086842f53bee3f6c655e6a3283effd3fbdff /drivers/net
parentc72e005b099302b3c6bee8381396199b77b6dd4f (diff)
[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.c2
-rw-r--r--drivers/net/smc91x.h2
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 @@
22#include <net/irda/wrapper.h> 22#include <net/irda/wrapper.h>
23#include <net/irda/irda_device.h> 23#include <net/irda/irda_device.h>
24 24
25#include <asm/dma.h> 25#include <mach/dma.h>
26#include <mach/irda.h> 26#include <mach/irda.h>
27#include <mach/hardware.h> 27#include <mach/hardware.h>
28#include <mach/pxa-regs.h> 28#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 {
527 * as RX which can overrun memory and lose packets. 527 * as RX which can overrun memory and lose packets.
528 */ 528 */
529#include <linux/dma-mapping.h> 529#include <linux/dma-mapping.h>
530#include <asm/dma.h> 530#include <mach/dma.h>
531#include <mach/hardware.h> 531#include <mach/hardware.h>
532#include <mach/pxa-regs.h> 532#include <mach/pxa-regs.h>
533 533