diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:58:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:58:42 -0700 |
| commit | a41842f70d6d6b0cfde3d21e163add81c4318ebd (patch) | |
| tree | 238fc75a5d10adc70ef7a4c812ac5cbd366fb9b5 /arch/arm/plat-samsung/include/plat | |
| parent | 722874465e3cd3268387b96e02220f84b35a8d98 (diff) | |
| parent | 0e17226f7cd289504724466f4298abc9bdfca3fe (diff) | |
Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux
* 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux:
ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362
ARM: SAMSUNG: Fix build error from stale define in <plat/uncompress.h>
ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver
ARM: S3C2440: Fix s3c2440 cpufreq compilation post move.
Diffstat (limited to 'arch/arm/plat-samsung/include/plat')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/uncompress.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h index e87ce8ffbbc..7d6ed7263d5 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) #define arch_error arch_decomp_error #endif -static void error(char *err); - #ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO static inline void arch_enable_uart_fifo(void) { |