diff options
| author | Arnd Bergmann <[email protected]> | 2012-03-15 21:05:52 +0000 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2012-03-15 21:05:52 +0000 |
| commit | 38abdcd0d0689aaca94e740ac67a952c7918caef (patch) | |
| tree | 83051487c15c3a062eb4dbff16c13e517c309a78 /arch/arm/mach-netx/include/mach/system.h | |
| parent | Merge tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/... (diff) | |
| parent | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ... (diff) | |
| download | kernel-38abdcd0d0689aaca94e740ac67a952c7918caef.tar.gz kernel-38abdcd0d0689aaca94e740ac67a952c7918caef.zip | |
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 <[email protected]>
Diffstat (limited to 'arch/arm/mach-netx/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-netx/include/mach/system.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-netx/include/mach/system.h b/arch/arm/mach-netx/include/mach/system.h deleted file mode 100644 index b38fa36d58c4..000000000000 --- a/arch/arm/mach-netx/include/mach/system.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * arch/arm/mach-netx/include/mach/system.h - * - * Copyright (C) 2005 Sascha Hauer <[email protected]>, Pengutronix - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __ASM_ARCH_SYSTEM_H -#define __ASM_ARCH_SYSTEM_H - -static inline void arch_idle(void) -{ - cpu_do_idle(); -} - -#endif - |