diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /include/asm-arm/arch-cl7500 | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'include/asm-arm/arch-cl7500')
| -rw-r--r-- | include/asm-arm/arch-cl7500/dma.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-cl7500/system.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-arm/arch-cl7500/dma.h b/include/asm-arm/arch-cl7500/dma.h index fb31f5db9..7bab998b9 100644 --- a/include/asm-arm/arch-cl7500/dma.h +++ b/include/asm-arm/arch-cl7500/dma.h @@ -13,7 +13,6 @@ * bytes of RAM. */ #define MAX_DMA_ADDRESS 0xd0000000 - #define MAX_DMA_CHANNELS 1 #define DMA_S0 0 diff --git a/include/asm-arm/arch-cl7500/system.h b/include/asm-arm/arch-cl7500/system.h index a44cc9373..1962f75e0 100644 --- a/include/asm-arm/arch-cl7500/system.h +++ b/include/asm-arm/arch-cl7500/system.h @@ -8,7 +8,7 @@ #include <asm/iomd.h> -extern __inline__ void arch_idle(void) +static void arch_idle(void) { while (!current->need_resched && !hlt_counter) outb(0, IOMD_SUSMODE); @@ -20,6 +20,4 @@ extern __inline__ void arch_idle(void) cpu_reset(0); \ } while (0); -#define arch_power_off() do { } while (0) - #endif |