Pull bugzilla-7880 into release branch

[mv-sheeva.git] / include / asm-arm / arch-s3c2410 / uncompress.h

diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/include/asm-arm/arch-s3c2410/uncompress.h
index 69551ffb4f8ba4c72a955ae996b661ed5b42a0e8..dcb2cef38f509b1eee3f88d54037b76aeab207d3 100644 (file)
--- a/include/asm-arm/arch-s3c2410/uncompress.h
+++ b/include/asm-arm/arch-s3c2410/uncompress.h
@@ -13,6 +13,7 @@
 #ifndef __ASM_ARCH_UNCOMPRESS_H
 #define __ASM_ARCH_UNCOMPRESS_H
 
+typedef unsigned int upf_t;    /* cannot include linux/serial_core.h */
 
 /* defines for UART registers */
 #include "asm/arch/regs-serial.h"