diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 11:59:04 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 11:59:13 (GMT) |
| commit | 34e5f4f198ddd36a82dc12164de7fc4f5430e09d (patch) | |
| tree | 70a06002170ddc2a859f877564834177f0f3df5d /arch/arm/mach-u300 | |
| parent | e76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff) | |
| parent | a570067df9cc1b1821ca5255bbbe8adb67aca199 (diff) | |
| download | linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.tar.xz | |
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.h | 14 |
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 574d46e..0000000 --- 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(); -} |