3 files changed, 5 insertions, 2 deletions

diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c
index 8f1f992f002..1d844e228ea 100644
--- a/arch/arm/mach-netx/fb.c
+++ b/arch/arm/mach-netx/fb.c
@@ -24,6 +24,8 @@
 #include <linux/amba/clcd.h>
 #include <linux/err.h>
 
+#include <asm/irq.h>
+
 #include <mach/netx-regs.h>
 #include <mach/hardware.h>
 
@@ -91,7 +93,7 @@ void clk_put(struct clk *clk)
 
 static struct amba_device fb_device = {
         .dev            = {
-                .bus_id = "fb",
+                .init_name = "fb",
                 .coherent_dma_mask = ~0,
         },
         .res            = {
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c
index d51d627ce7c..f201fddb594 100644
--- a/arch/arm/mach-netx/time.c
+++ b/arch/arm/mach-netx/time.c
@@ -163,7 +163,7 @@ static void __init netx_timer_init(void)
          * Adding some safety ... */
         netx_clockevent.min_delta_ns =
                 clockevent_delta2ns(0xa00, &netx_clockevent);
-        netx_clockevent.cpumask = cpumask_of_cpu(0);
+        netx_clockevent.cpumask = cpumask_of(0);
         clockevents_register_device(&netx_clockevent);
 }
 
diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c
index 8fc6205dc3a..181a78ba816 100644
--- a/arch/arm/mach-netx/xc.c
+++ b/arch/arm/mach-netx/xc.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 
 #include <mach/hardware.h>
+#include <mach/irqs.h>
 #include <mach/netx-regs.h>
 
 #include <mach/xc.h>