Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / arm / mach-spear3xx / spear310_evb.c

diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c
index 4e55e55..2d7f333 100644 (file)
--- a/arch/arm/mach-spear3xx/spear310_evb.c
+++ b/arch/arm/mach-spear3xx/spear310_evb.c
@@ -14,7 +14,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 #include <mach/generic.h>
-#include <mach/spear.h>
+#include <mach/hardware.h>
 
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
@@ -78,6 +78,6 @@ MACHINE_START(SPEAR310, "ST-SPEAR310-EVB")
        .boot_params    =       0x00000100,
        .map_io         =       spear3xx_map_io,
        .init_irq       =       spear3xx_init_irq,
-       .timer          =       &spear_sys_timer,
+       .timer          =       &spear3xx_timer,
        .init_machine   =       spear310_evb_init,
 MACHINE_END