summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/include/mach/system.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-23 11:59:04 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-23 11:59:13 +0000
commit34e5f4f198ddd36a82dc12164de7fc4f5430e09d (patch)
tree70a06002170ddc2a859f877564834177f0f3df5d /arch/arm/mach-omap2/include/mach/system.h
parente76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff)
parenta570067df9cc1b1821ca5255bbbe8adb67aca199 (diff)
downloadlinux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.tar.gz
linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.tar.bz2
linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.zip
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/system.h')
-rw-r--r--arch/arm/mach-omap2/include/mach/system.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/include/mach/system.h b/arch/arm/mach-omap2/include/mach/system.h
deleted file mode 100644
index d488721ab90b..000000000000
--- a/arch/arm/mach-omap2/include/mach/system.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * arch/arm/mach-omap2/include/mach/system.h
- */
-
-#include <plat/system.h>