summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/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-msm/include/mach/system.h
parente76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff)
parenta570067df9cc1b1821ca5255bbbe8adb67aca199 (diff)
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-msm/include/mach/system.h')
-rw-r--r--arch/arm/mach-msm/include/mach/system.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/include/mach/system.h b/arch/arm/mach-msm/include/mach/system.h
index 311db2b35da..f5fb2ec87ff 100644
--- a/arch/arm/mach-msm/include/mach/system.h
+++ b/arch/arm/mach-msm/include/mach/system.h
@@ -12,7 +12,6 @@
* GNU General Public License for more details.
*
*/
-void arch_idle(void);
/* low level hardware reset hook -- for example, hitting the
* PSHOLD line on the PMIC to hard reset the system