Merge branch 'sh/driver-core'

[pandora-kernel.git] / arch / arm / mach-netx / fb.c

diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c
index 8f1f992..5b84bcd 100644 (file)
--- a/arch/arm/mach-netx/fb.c
+++ b/arch/arm/mach-netx/fb.c
@@ -23,6 +23,9 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 #include <linux/err.h>
+#include <linux/gfp.h>
+
+#include <asm/irq.h>
 
 #include <mach/netx-regs.h>
 #include <mach/hardware.h>
@@ -91,7 +94,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            = {