[PATCH] OMAP4: small header cleanup

Teresa Gámez t.gamez at phytec.de
Tue Jul 24 07:45:03 EDT 2012


Use <mach/clocks.h> for OMAP4.

Signed-off-by: Teresa Gámez <t.gamez at phytec.de>
---
 arch/arm/mach-omap/include/mach/clocks.h |    3 +++
 arch/arm/mach-omap/omap4_clock.c         |    4 ++--
 arch/arm/mach-omap/omap4_generic.c       |    5 ++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap/include/mach/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h
index 1221238..3efa057 100644
--- a/arch/arm/mach-omap/include/mach/clocks.h
+++ b/arch/arm/mach-omap/include/mach/clocks.h
@@ -44,5 +44,8 @@
 #ifdef CONFIG_ARCH_OMAP3
 #include <mach/omap3-clock.h>
 #endif
+#ifdef CONFIG_ARCH_OMAP4
+#include <mach/omap4-clock.h>
+#endif
 
 #endif /* __OMAP_CLOCKS_H_ */
diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
index f8bab5f..3ab01f0 100644
--- a/arch/arm/mach-omap/omap4_clock.c
+++ b/arch/arm/mach-omap/omap4_clock.c
@@ -1,7 +1,7 @@
 #include <common.h>
-#include <mach/syslib.h>
 #include <io.h>
-#include <mach/omap4-clock.h>
+#include <mach/syslib.h>
+#include <mach/clocks.h>
 
 #define LDELAY	12000000
 
diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
index 5092242..de69934 100644
--- a/arch/arm/mach-omap/omap4_generic.c
+++ b/arch/arm/mach-omap/omap4_generic.c
@@ -1,10 +1,9 @@
 #include <common.h>
 #include <init.h>
-#include <mach/silicon.h>
 #include <io.h>
-#include <mach/omap4-silicon.h>
+#include <mach/clocks.h>
+#include <mach/silicon.h>
 #include <mach/omap4-mux.h>
-#include <mach/omap4-clock.h>
 #include <mach/syslib.h>
 #include <mach/xload.h>
 #include <mach/gpmc.h>
-- 
1.7.0.4




More information about the barebox mailing list