diff options
| -rw-r--r-- | arch/arm/boot/compressed/misc.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/uncompress.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index d32bc71c1f78..d2b2ef41cd4f 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
| @@ -33,6 +33,7 @@ unsigned int __machine_arch_type; | |||
| 33 | #else | 33 | #else |
| 34 | 34 | ||
| 35 | static void putstr(const char *ptr); | 35 | static void putstr(const char *ptr); |
| 36 | extern void error(char *x); | ||
| 36 | 37 | ||
| 37 | #include <mach/uncompress.h> | 38 | #include <mach/uncompress.h> |
| 38 | 39 | ||
diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h index e87ce8ffbbcd..7d6ed7263d57 100644 --- a/arch/arm/plat-samsung/include/plat/uncompress.h +++ b/arch/arm/plat-samsung/include/plat/uncompress.h | |||
| @@ -140,8 +140,6 @@ static void arch_decomp_error(const char *x) | |||
| 140 | #define arch_error arch_decomp_error | 140 | #define arch_error arch_decomp_error |
| 141 | #endif | 141 | #endif |
| 142 | 142 | ||
| 143 | static void error(char *err); | ||
| 144 | |||
| 145 | #ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO | 143 | #ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO |
| 146 | static inline void arch_enable_uart_fifo(void) | 144 | static inline void arch_enable_uart_fifo(void) |
| 147 | { | 145 | { |
