summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/include/mach/system.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-02-17 15:12:36 -0800
committerTony Lindgren <tony@atomide.com>2012-02-17 15:12:36 -0800
commit4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4 (patch)
tree72e500b97c4bdcb9631209f3121f42b05ae30fea /arch/arm/mach-msm/include/mach/system.h
parent40c0591f0a349ec074357e05c6ab1a3bc951807c (diff)
parent19bfb76ca32f8e4fa80746608ff4a77707f40520 (diff)
downloadlinux-4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4.tar.bz2
Merge branch 'for_3.4/dt_base' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/arm/mach-msm/include/mach/system.h')
-rw-r--r--arch/arm/mach-msm/include/mach/system.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-msm/include/mach/system.h b/arch/arm/mach-msm/include/mach/system.h
index d2e83f42ba16..311db2b35da0 100644
--- a/arch/arm/mach-msm/include/mach/system.h
+++ b/arch/arm/mach-msm/include/mach/system.h
@@ -12,16 +12,8 @@
* GNU General Public License for more details.
*
*/
-
-#include <mach/hardware.h>
-
void arch_idle(void);
-static inline void arch_reset(char mode, const char *cmd)
-{
- for (;;) ; /* depends on IPC w/ other core */
-}
-
/* low level hardware reset hook -- for example, hitting the
* PSHOLD line on the PMIC to hard reset the system
*/