Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / arch / arm / mach-omap2 / board-am3517crane.c

diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c
index 318feadb1d6e7ed4f6df2f6a9b152969a2d0f286..51b96a1206d198dcdeef25ac5f76c0c06e9cb080 100644 (file)
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@ -26,7 +26,6 @@
 #include <asm/mach/map.h>
 
 #include "common.h"
-#include <plat/usb.h>
 
 #include "am35xx-emac.h"
 #include "mux.h"
@@ -94,5 +93,5 @@ MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")
        .init_machine   = am3517_crane_init,
        .init_late      = am35xx_init_late,
        .timer          = &omap3_timer,
-       .restart        = omap_prcm_restart,
+       .restart        = omap3xxx_restart,
 MACHINE_END