Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-netx / fb.c

diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c
index 8f1f992f002ee6804e19edf7cfd552a993f2f58d..1d844e228ea92e6a674e92a6b0fcb3e2cb3eef42 100644 (file)
--- 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            = {