Patched in Tegra support.

1 files changed, 5 insertions, 7 deletions

diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c
index a9c9c163dd9..60a6781e7a8 100644
--- a/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/arch/arm/mach-pxa/colibri-pxa300.c
@@ -24,8 +24,8 @@
 
 #include <mach/pxa300.h>
 #include <mach/colibri.h>
-#include <linux/platform_data/usb-ohci-pxa27x.h>
-#include <linux/platform_data/video-pxafb.h>
+#include <mach/ohci.h>
+#include <mach/pxafb.h>
 #include <mach/audio.h>
 
 #include "generic.h"
@@ -78,8 +78,8 @@ static struct resource colibri_asix_resource[] = {
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
-                .start = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),
-                .end   = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),
+                .start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),
+                .end   = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),
                 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,
         }
 };
@@ -183,13 +183,11 @@ void __init colibri_pxa300_init(void)
 }
 
 MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")
-        .atag_offset    = 0x100,
+        .boot_params    = COLIBRI_SDRAM_BASE + 0x100,
         .init_machine   = colibri_pxa300_init,
         .map_io         = pxa3xx_map_io,
-        .nr_irqs        = PXA_NR_IRQS,
         .init_irq       = pxa3xx_init_irq,
         .handle_irq     = pxa3xx_handle_irq,
         .timer          = &pxa_timer,
-        .restart        = pxa_restart,
 MACHINE_END