diff options
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 427c2d8dc123..4ac04055c2ea 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -407,7 +407,7 @@ static struct mmc_platform_data mmc_data = { | |||
407 | 407 | ||
408 | static struct amba_device mmc_device = { | 408 | static struct amba_device mmc_device = { |
409 | .dev = { | 409 | .dev = { |
410 | .bus_id = "mb:1c", | 410 | .init_name = "mb:1c", |
411 | .platform_data = &mmc_data, | 411 | .platform_data = &mmc_data, |
412 | }, | 412 | }, |
413 | .res = { | 413 | .res = { |
@@ -421,7 +421,7 @@ static struct amba_device mmc_device = { | |||
421 | 421 | ||
422 | static struct amba_device aaci_device = { | 422 | static struct amba_device aaci_device = { |
423 | .dev = { | 423 | .dev = { |
424 | .bus_id = "mb:1d", | 424 | .init_name = "mb:1d", |
425 | }, | 425 | }, |
426 | .res = { | 426 | .res = { |
427 | .start = INTCP_PA_AACI_BASE, | 427 | .start = INTCP_PA_AACI_BASE, |
@@ -532,7 +532,7 @@ static struct clcd_board clcd_data = { | |||
532 | 532 | ||
533 | static struct amba_device clcd_device = { | 533 | static struct amba_device clcd_device = { |
534 | .dev = { | 534 | .dev = { |
535 | .bus_id = "mb:c0", | 535 | .init_name = "mb:c0", |
536 | .coherent_dma_mask = ~0, | 536 | .coherent_dma_mask = ~0, |
537 | .platform_data = &clcd_data, | 537 | .platform_data = &clcd_data, |
538 | }, | 538 | }, |