From: Tony Lindgren <tony@atomide.com>
Date: Tue, 15 Nov 2005 20:19:49 +0000 (-0800)
Subject: ARM: OMAP: Fix compile for H4
X-Git-Tag: v2.6.15-omap2~91
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=30ce5e975012e9935b3010e54e6cdab2cf049f4b;p=linux-2.6-omap-h63xx.git

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 363b3bae504..7ef664bc9e3 100644
--- 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 75b80271972..5ef3eb44ef3 100644
--- 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;