diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:45:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 10:45:22 -0800 |
| commit | 8995b161eb142b843094dd614b80e4cce1d66352 (patch) | |
| tree | ffd9988879441d5ec45ab96b2e06f4fcb1210158 /include/asm-arm/arch-l7200 | |
| parent | cc918c7ab7da017bfaf9661420bb5c462e057cfb (diff) | |
| parent | fe5dd7c73d328b255286b6b65ca19dd34447f709 (diff) | |
| download | op-kernel-dev-8995b161eb142b843094dd614b80e4cce1d66352.zip op-kernel-dev-8995b161eb142b843094dd614b80e4cce1d66352.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-l7200')
| -rw-r--r-- | include/asm-arm/arch-l7200/dma.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-l7200/system.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/arch-l7200/dma.h b/include/asm-arm/arch-l7200/dma.h index 6595b38..4c7eca6 100644 --- a/include/asm-arm/arch-l7200/dma.h +++ b/include/asm-arm/arch-l7200/dma.h @@ -17,7 +17,6 @@ * bytes of RAM. */ #define MAX_DMA_ADDRESS 0xd0000000 -#define MAX_DMA_CHANNELS 0 #define DMA_S0 0 diff --git a/include/asm-arm/arch-l7200/system.h b/include/asm-arm/arch-l7200/system.h index cb4ff29..18825cf 100644 --- a/include/asm-arm/arch-l7200/system.h +++ b/include/asm-arm/arch-l7200/system.h @@ -12,6 +12,8 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H +#include <asm/hardware.h> + static inline void arch_idle(void) { *(unsigned long *)(IO_BASE + 0x50004) = 1; /* idle mode */ |
