diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /include/asm-arm/arch-ixp4xx/dma.h | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/dma.h')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/dma.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/arch-ixp4xx/dma.h b/include/asm-arm/arch-ixp4xx/dma.h index 789f7f53c357..2c7f5327d80f 100644 --- a/include/asm-arm/arch-ixp4xx/dma.h +++ b/include/asm-arm/arch-ixp4xx/dma.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define __ASM_ARCH_DMA_H | 12 | #define __ASM_ARCH_DMA_H |
| 13 | 13 | ||
| 14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 15 | #include <linux/pci.h> | ||
| 16 | #include <asm/page.h> | 15 | #include <asm/page.h> |
| 17 | #include <asm/sizes.h> | 16 | #include <asm/sizes.h> |
| 18 | #include <asm/hardware.h> | 17 | #include <asm/hardware.h> |