Merge branch 'fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / arch / arm / mach-realview / core.h

diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 63be2abdc19ce299d52556ef4e68a28de6edabd8..44269b162d4918e468542ab58a3627cda43c014d 100644 (file)
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -31,7 +31,7 @@
 static struct amba_device name##_device = {                    \
        .dev            = {                                     \
                .coherent_dma_mask = ~0,                        \
-               .bus_id = busid,                                \
+               .init_name = busid,                             \
                .platform_data = plat,                          \
        },                                                      \
        .res            = {                                     \