arm: struct device - replace bus_id with dev_name(), dev_set_name()

[linux-2.6-omap-h63xx.git] / arch / arm / mach-lh7a40x / clcd.c

diff --git a/arch/arm/mach-lh7a40x/clcd.c b/arch/arm/mach-lh7a40x/clcd.c
index 1992db4c25236c19ca10b8007d58bf1125fba90c..c472b9e8b37cd3bf6710ae555b0e356b3ab9f01d 100644 (file)
--- a/arch/arm/mach-lh7a40x/clcd.c
+++ b/arch/arm/mach-lh7a40x/clcd.c
@@ -17,14 +17,13 @@
 
 //#include <linux/module.h>
 //#include <linux/time.h>
-//#include <asm/hardware.h>
 
 //#include <asm/mach/time.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 
 #include <asm/system.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
 
@@ -208,7 +207,7 @@ static struct clcd_board clcd_platform_data = {
 static struct amba_device name##_device = {                    \
        .dev = {                                                \
                .coherent_dma_mask = ~0,                        \
-               .bus_id = busid,                                \
+               .init_name = busid,                             \
                .platform_data = plat,                          \
                },                                              \
        .res = {                                                \