diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 14:27:34 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 14:27:34 +0000 |
| commit | 2cbe23e3a432e3d09a849adb197c8fcc09e7391d (patch) | |
| tree | 711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06 /arch/arm/mach-zynq/include/mach/system.h | |
| parent | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (diff) | |
| parent | ed1b4acc43b0c3289faa30cf184f322ab70a5be3 (diff) | |
| download | op-kernel-dev-2cbe23e3a432e3d09a849adb197c8fcc09e7391d.zip op-kernel-dev-2cbe23e3a432e3d09a849adb197c8fcc09e7391d.tar.gz | |
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-zynq/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/system.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/mach-zynq/include/mach/system.h b/arch/arm/mach-zynq/include/mach/system.h deleted file mode 100644 index 8e88e0b..0000000 --- a/arch/arm/mach-zynq/include/mach/system.h +++ /dev/null @@ -1,23 +0,0 @@ -/* arch/arm/mach-zynq/include/mach/system.h - * - * Copyright (C) 2011 Xilinx - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __MACH_SYSTEM_H__ -#define __MACH_SYSTEM_H__ - -static inline void arch_idle(void) -{ - cpu_do_idle(); -} - -#endif |
