Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes

[cascardo/linux.git] / arch / arm / mach-msm / board-halibut.c

diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c
index a775298..61bfe58 100644 (file)
--- a/arch/arm/mach-msm/board-halibut.c
+++ b/arch/arm/mach-msm/board-halibut.c
@@ -83,11 +83,6 @@ static void __init halibut_init(void)
        platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
-static void __init halibut_fixup(struct tag *tags, char **cmdline,
-                                struct meminfo *mi)
-{
-}
-
 static void __init halibut_map_io(void)
 {
        msm_map_common_io();
@@ -100,7 +95,6 @@ static void __init halibut_init_late(void)
 
 MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")
        .atag_offset    = 0x100,
-       .fixup          = halibut_fixup,
        .map_io         = halibut_map_io,
        .init_early     = halibut_init_early,
        .init_irq       = halibut_init_irq,