diff options
Diffstat (limited to 'arch/arm/mach-rpc')
-rw-r--r-- | arch/arm/mach-rpc/dma.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/uncompress.h | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c index c47d974d52bd..85883b2e0e49 100644 --- a/arch/arm/mach-rpc/dma.c +++ b/arch/arm/mach-rpc/dma.c | |||
@@ -9,7 +9,6 @@ | |||
9 | * | 9 | * |
10 | * DMA functions specific to RiscPC architecture | 10 | * DMA functions specific to RiscPC architecture |
11 | */ | 11 | */ |
12 | #include <linux/slab.h> | ||
13 | #include <linux/mman.h> | 12 | #include <linux/mman.h> |
14 | #include <linux/init.h> | 13 | #include <linux/init.h> |
15 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
diff --git a/arch/arm/mach-rpc/include/mach/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S index b2a939ffdcde..6fc8d66395dc 100644 --- a/arch/arm/mach-rpc/include/mach/debug-macro.S +++ b/arch/arm/mach-rpc/include/mach/debug-macro.S | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | .macro addruart,rx | 14 | .macro addruart, rx, tmp |
15 | mrc p15, 0, \rx, c1, c0 | 15 | mrc p15, 0, \rx, c1, c0 |
16 | tst \rx, #1 @ MMU enabled? | 16 | tst \rx, #1 @ MMU enabled? |
17 | moveq \rx, #0x03000000 | 17 | moveq \rx, #0x03000000 |
diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h index d5862368c4f2..8c9e2c7161c6 100644 --- a/arch/arm/mach-rpc/include/mach/uncompress.h +++ b/arch/arm/mach-rpc/include/mach/uncompress.h | |||
@@ -109,8 +109,6 @@ static inline void flush(void) | |||
109 | { | 109 | { |
110 | } | 110 | } |
111 | 111 | ||
112 | static void error(char *x); | ||
113 | |||
114 | /* | 112 | /* |
115 | * Setup for decompression | 113 | * Setup for decompression |
116 | */ | 114 | */ |