aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/dma.h4
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/io.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/dma.h b/arch/arm/mach-ixp4xx/include/mach/dma.h
index 00c5070c0201..65944f252664 100644
--- a/arch/arm/mach-ixp4xx/include/mach/dma.h
+++ b/arch/arm/mach-ixp4xx/include/mach/dma.h
@@ -11,10 +11,8 @@
11#ifndef __ASM_ARCH_DMA_H 11#ifndef __ASM_ARCH_DMA_H
12#define __ASM_ARCH_DMA_H 12#define __ASM_ARCH_DMA_H
13 13
14#include <linux/device.h> 14#include <asm/memory.h>
15#include <asm/page.h>
16#include <asm/sizes.h> 15#include <asm/sizes.h>
17#include <mach/hardware.h>
18 16
19#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) 17#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M)
20 18
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h
index 319948e31bec..b7f780f574fa 100644
--- a/arch/arm/mach-ixp4xx/include/mach/io.h
+++ b/arch/arm/mach-ixp4xx/include/mach/io.h
@@ -49,8 +49,6 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);
49 49
50#else 50#else
51 51
52#include <linux/mm.h>
53
54/* 52/*
55 * In the case of using indirect PCI, we simply return the actual PCI 53 * In the case of using indirect PCI, we simply return the actual PCI
56 * address and our read/write implementation use that to drive the 54 * address and our read/write implementation use that to drive the