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-ux500 | |
| parent | e76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff) | |
| parent | a570067df9cc1b1821ca5255bbbe8adb67aca199 (diff) | |
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/system.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mach-ux500/include/mach/system.h b/arch/arm/mach-ux500/include/mach/system.h deleted file mode 100644 index 258e5c919c24..000000000000 --- a/arch/arm/mach-ux500/include/mach/system.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2009 ST-Ericsson. | ||
| 3 | * | ||
| 4 | * This file is licensed under the terms of the GNU General Public | ||
| 5 | * License version 2. This program is licensed "as is" without any | ||
| 6 | * warranty of any kind, whether express or implied. | ||
| 7 | */ | ||
| 8 | #ifndef __ASM_ARCH_SYSTEM_H | ||
| 9 | #define __ASM_ARCH_SYSTEM_H | ||
| 10 | |||
| 11 | static inline void arch_idle(void) | ||
| 12 | { | ||
| 13 | /* | ||
| 14 | * This should do all the clock switching | ||
| 15 | * and wait for interrupt tricks | ||
| 16 | */ | ||
| 17 | cpu_do_idle(); | ||
| 18 | } | ||
| 19 | |||
| 20 | #endif | ||