summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/include/mach/system.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-11-22 19:08:43 +0100
committerTony Lindgren <tony@atomide.com>2009-11-22 19:08:43 +0100
commita76df42a675c9936e8bf3607226e74c8a5e2d847 (patch)
tree96d93706d884dea956393653452fa4d78d8d7f76 /arch/arm/mach-omap1/include/mach/system.h
parentLinux 2.6.32-rc8 (diff)
parentMerge branch 'pm-upstream/pm-cpuidle' of ssh://master.kernel.org/pub/scm/linu... (diff)
downloadlinux-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.xz
linux-a76df42a675c9936e8bf3607226e74c8a5e2d847.zip
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/system.h')
-rw-r--r--arch/arm/mach-omap1/include/mach/system.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/include/mach/system.h b/arch/arm/mach-omap1/include/mach/system.h
new file mode 100644
index 000000000000..a6c1b3a16dfc
--- /dev/null
+++ b/arch/arm/mach-omap1/include/mach/system.h
@@ -0,0 +1,5 @@
+/*
+ * arch/arm/mach-omap1/include/mach/system.h
+ */
+
+#include <plat/system.h>