summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorRussell King2012-01-23 12:59:04 +0100
committerRussell King2012-01-23 12:59:13 +0100
commit34e5f4f198ddd36a82dc12164de7fc4f5430e09d (patch)
tree70a06002170ddc2a859f877564834177f0f3df5d /arch/arm/mach-u300
parentARM: debug: arrange Kconfig options more logically (diff)
parentARM: big removal of now unused arch_idle() (diff)
downloadkernel-qcow2-linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.tar.gz
kernel-qcow2-linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.tar.xz
kernel-qcow2-linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.zip
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/include/mach/system.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-u300/include/mach/system.h b/arch/arm/mach-u300/include/mach/system.h
deleted file mode 100644
index 574d46e38290..000000000000
--- a/arch/arm/mach-u300/include/mach/system.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *
- * arch/arm/mach-u300/include/mach/system.h
- *
- *
- * Copyright (C) 2007-2009 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * System shutdown and reset functions.
- * Author: Linus Walleij <linus.walleij@stericsson.com>
- */
-static inline void arch_idle(void)
-{
- cpu_do_idle();
-}