[GIT,PULL] for testing: OMAP hwmod driver conversions: watchdog, UART, i2c

Commit Message

Santosh Shilimkar Sept. 30, 2010, 7:55 a.m. UTC

None

Patch

diff --git a/arch/arm/mach-omap1/include/mach/control.h b/arch/arm/mach-omap1/include/mach/control.h
new file mode 100644
index 0000000..c1fd4c0
--- /dev/null
+++ b/arch/arm/mach-omap1/include/mach/control.h
@@ -0,0 +1,3 @@ 
+/*
+ * arch/arm/mach-omap1/include/mach/control.h
+ */
diff --git a/arch/arm/mach-omap2/include/mach/control.h b/arch/arm/mach-omap2/include/mach/control.h
new file mode 100644
index 0000000..dd41272
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/control.h
@@ -0,0 +1,8 @@ 
+/*
+ * arch/arm/mach-omap2/include/mach/control.h
+ */
+#include <mach/ctrl_module_core_44xx.h>
+#include <mach/ctrl_module_wkup_44xx.h>
+#include <mach/ctrl_module_pad_core_44xx.h>
+#include <mach/ctrl_module_pad_wkup_44xx.h>
+
diff --git a/arch/arm/plat-omap/include/plat/control.h b/arch/arm/plat-omap/include/plat/control.h
index 19c9b2a..7b047e5 100644
--- a/arch/arm/plat-omap/include/plat/control.h
+++ b/arch/arm/plat-omap/include/plat/control.h
@@ -17,10 +17,7 @@ 
 #define __ASM_ARCH_CONTROL_H
 
 #include <mach/io.h>
-#include <mach/ctrl_module_core_44xx.h>
-#include <mach/ctrl_module_wkup_44xx.h>
-#include <mach/ctrl_module_pad_core_44xx.h>
-#include <mach/ctrl_module_pad_wkup_44xx.h>
+#include <mach/control.h>
 
 #ifndef __ASSEMBLY__
 #define OMAP242X_CTRL_REGADDR(reg)					\