ARM: OMAP: Fix compile for H4

Fix compile for H4

diff --git a/include/asm-arm/arch-omap/board-h4.h b/include/asm-arm/arch-omap/board-h4.h
index 363b3bae504891e748b0f3965fd0b3cbbe14f740..7ef664bc9e330c4b284cdd81042ca38bb670066a 100644 (file)
--- a/include/asm-arm/arch-omap/board-h4.h
+++ b/include/asm-arm/arch-omap/board-h4.h
@@ -33,17 +33,6 @@
 /* GPMC CS1 */
 #define OMAP24XX_ETHR_START             0x08000300
 #define OMAP24XX_ETHR_GPIO_IRQ         92
-
-<<<<<<< include/asm-arm/arch-omap/board-h4.h
-#define H4_CS0_BASE                 0x04000000
-
-=======
-#define H4_CS0_BASE                 0x04000000
-
-#define H4_CS0_BASE                 0x04000000
-
-#define H4_CS0_BASE                 0x04000000
-
->>>>>>> .merge_file_d153T1
+#define H4_CS0_BASE                    0x04000000
 #endif /*  __ASM_ARCH_OMAP_H4_H */
 

diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h
index 75b802719723ad459d719b6f598254fe0dfe02e4..5ef3eb44ef398dd1e49d509795af0018fb4f5554 100644 (file)
--- a/include/asm-arm/atomic.h
+++ b/include/asm-arm/atomic.h
@@ -12,6 +12,7 @@
 #define __ASM_ARM_ATOMIC_H
 
 #include <linux/config.h>
+#include <linux/types.h>
 
 typedef struct { volatile int counter; } atomic_t;