git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
[pandora-kernel.git]
/
arch
/
arm
/
mach-spear6xx
/
spear600_evb.c
diff --git
a/arch/arm/mach-spear6xx/spear600_evb.c
b/arch/arm/mach-spear6xx/spear600_evb.c
index
daff8d0
..
f19cefe
100644
(file)
--- a/
arch/arm/mach-spear6xx/spear600_evb.c
+++ b/
arch/arm/mach-spear6xx/spear600_evb.c
@@
-14,7
+14,7
@@
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
-#include <mach/
spear
.h>
+#include <mach/
hardware
.h>
static struct amba_device *amba_devs[] __initdata = {
&gpio_device[0],
static struct amba_device *amba_devs[] __initdata = {
&gpio_device[0],
@@
-46,6
+46,6
@@
MACHINE_START(SPEAR600, "ST-SPEAR600-EVB")
.boot_params = 0x00000100,
.map_io = spear6xx_map_io,
.init_irq = spear6xx_init_irq,
.boot_params = 0x00000100,
.map_io = spear6xx_map_io,
.init_irq = spear6xx_init_irq,
- .timer = &spear
_sys
_timer,
+ .timer = &spear
6xx
_timer,
.init_machine = spear600_evb_init,
MACHINE_END
.init_machine = spear600_evb_init,
MACHINE_END