diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 15:59:04 +0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-23 15:59:13 +0400 |
commit | 34e5f4f198ddd36a82dc12164de7fc4f5430e09d (patch) | |
tree | 70a06002170ddc2a859f877564834177f0f3df5d /arch/arm/mach-davinci/include | |
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-davinci/include')
-rw-r--r-- | arch/arm/mach-davinci/include/mach/system.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/mach-davinci/include/mach/system.h b/arch/arm/mach-davinci/include/mach/system.h deleted file mode 100644 index fcb7a015aba5..000000000000 --- a/arch/arm/mach-davinci/include/mach/system.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * DaVinci system defines - * - * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com> - * - * 2007 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. - */ -#ifndef __ASM_ARCH_SYSTEM_H -#define __ASM_ARCH_SYSTEM_H - -#include <mach/common.h> - -static inline void arch_idle(void) -{ - cpu_do_idle(); -} - -#endif /* __ASM_ARCH_SYSTEM_H */ |