diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 06:59:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 06:59:13 -0500 |
| commit | 34e5f4f198ddd36a82dc12164de7fc4f5430e09d (patch) | |
| tree | 70a06002170ddc2a859f877564834177f0f3df5d /arch/arm/mach-mmp | |
| parent | e76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff) | |
| parent | a570067df9cc1b1821ca5255bbbe8adb67aca199 (diff) | |
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-mmp')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/system.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-mmp/include/mach/system.h b/arch/arm/mach-mmp/include/mach/system.h deleted file mode 100644 index 1d001eab81e1..000000000000 --- a/arch/arm/mach-mmp/include/mach/system.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-mmp/include/mach/system.h | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef __ASM_MACH_SYSTEM_H | ||
| 10 | #define __ASM_MACH_SYSTEM_H | ||
| 11 | |||
| 12 | static inline void arch_idle(void) | ||
| 13 | { | ||
| 14 | cpu_do_idle(); | ||
| 15 | } | ||
| 16 | #endif /* __ASM_MACH_SYSTEM_H */ | ||