diff --git a/[refs] b/[refs] index 50f80f6d889d..e32029b6e875 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58e5b9e3d0b5e1319fd24124e79b4d4e6188bf1b +refs/heads/master: 46c1bf813376654f6b75120b9c2cf3de0f67af7d diff --git a/trunk/arch/arm/mach-ux500/cpu-db8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c index 6e9a06d693a6..472b49f90317 100644 --- a/trunk/arch/arm/mach-ux500/cpu-db8500.c +++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c @@ -338,7 +338,7 @@ static const char * u8500_dt_board_compat[] = { NULL, }; -DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)") +DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") .map_io = u8500_map_io, .init_irq = ux500_init_irq, /* we re-use nomadik timer here */ @@ -349,14 +349,4 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)") .dt_compat = u8500_dt_board_compat, MACHINE_END -DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)") - .map_io = u8500_map_io, - .init_irq = ux500_init_irq, - .timer = &ux500_timer, - .handle_irq = gic_handle_irq, - .init_machine = u8500_init_machine, - .init_late = NULL, - .dt_compat = u8500_dt_board_compat, -MACHINE_END - #endif