diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 18:27:34 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 18:27:34 +0400 |
| commit | 2cbe23e3a432e3d09a849adb197c8fcc09e7391d (patch) | |
| tree | 711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06 /arch/arm/mach-shark/include/mach/system.h | |
| parent | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (diff) | |
| parent | ed1b4acc43b0c3289faa30cf184f322ab70a5be3 (diff) | |
| download | linux-2cbe23e3a432e3d09a849adb197c8fcc09e7391d.tar.xz | |
Merge branch 'tegra/cleanups' into next/timer
Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-vexpress/core.h
The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shark/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/system.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h deleted file mode 100644 index 1b2f2c5050a8..000000000000 --- a/arch/arm/mach-shark/include/mach/system.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * arch/arm/mach-shark/include/mach/system.h - * - * by Alexander Schulz - */ -#ifndef __ASM_ARCH_SYSTEM_H -#define __ASM_ARCH_SYSTEM_H - -static inline void arch_idle(void) -{ -} - -#endif |