Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[pandora-kernel.git] / arch / arm / mach-versatile / core.h

diff --git a/arch/arm/mach-versatile/core.h b/arch/arm/mach-versatile/core.h
index afcaa85..9d39886 100644 (file)
--- a/arch/arm/mach-versatile/core.h
+++ b/arch/arm/mach-versatile/core.h
@@ -34,7 +34,7 @@ extern unsigned int mmc_status(struct device *dev);
 static struct amba_device name##_device = {                    \
        .dev            = {                                     \
                .coherent_dma_mask = ~0,                        \
-               .bus_id = busid,                                \
+               .init_name = busid,                             \
                .platform_data = plat,                          \
        },                                                      \
        .res            = {                                     \