diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 21:25:17 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 21:25:17 +0100 |
| commit | a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78 (patch) | |
| tree | cac33ce0abaaeb56b6e08a396cb7ff4e3e3b8f61 /arch/arm/mach-spear6xx/spear600.c | |
| parent | Merge branch 'ux500/dt' into next/dt2 (diff) | |
| parent | ARM: SPEAr600: Add device-tree support to SPEAr600 boards (diff) | |
| download | linux-a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78.tar.xz linux-a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78.zip | |
Merge branch 'spear/dt' into next/dt2
* spear/dt:
ARM: SPEAr600: Add device-tree support to SPEAr600 boards
(update to v3.3-rc7)
Conflicts:
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-vexpress/Kconfig
The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear6xx/spear600.c')
| -rw-r--r-- | arch/arm/mach-spear6xx/spear600.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm/mach-spear6xx/spear600.c b/arch/arm/mach-spear6xx/spear600.c deleted file mode 100644 index d0e6eeae9b04..000000000000 --- a/arch/arm/mach-spear6xx/spear600.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * arch/arm/mach-spear6xx/spear600.c - * - * SPEAr600 machine source file - * - * Copyright (C) 2009 ST Microelectronics - * Rajeev Kumar<rajeev-dlh.kumar@st.com> - * - * 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. - */ - -#include <linux/ptrace.h> -#include <asm/irq.h> -#include <mach/generic.h> -#include <mach/hardware.h> - -/* Add spear600 specific devices here */ - -void __init spear600_init(void) -{ - /* call spear6xx family common init function */ - spear6xx_init(); -} |