diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:05:52 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:05:52 -0400 |
| commit | 38abdcd0d0689aaca94e740ac67a952c7918caef (patch) | |
| tree | 83051487c15c3a062eb4dbff16c13e517c309a78 /arch/arm/plat-omap | |
| parent | 709baa67c676a187a63c0f0f40efceb3fb1eef72 (diff) | |
| parent | 61b80086a525c8a6081257ae40da5dee2bcaee16 (diff) | |
Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2
Conflicts:
arch/arm/mach-tegra/common.c
arch/arm/mach-ux500/devices-common.c
This resolves two conflicts and lets us merge the exynos5 branch
cleanly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/system.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/plat-omap/include/plat/system.h b/arch/arm/plat-omap/include/plat/system.h deleted file mode 100644 index 8e5ebd74b129..000000000000 --- a/arch/arm/plat-omap/include/plat/system.h +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copied from arch/arm/mach-sa1100/include/mach/system.h | ||
| 3 | * Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net> | ||
| 4 | */ | ||
| 5 | #ifndef __ASM_ARCH_SYSTEM_H | ||
| 6 | #define __ASM_ARCH_SYSTEM_H | ||
| 7 | |||
| 8 | #include <asm/proc-fns.h> | ||
| 9 | |||
| 10 | static inline void arch_idle(void) | ||
| 11 | { | ||
| 12 | cpu_do_idle(); | ||
| 13 | } | ||
| 14 | |||
| 15 | #endif | ||