Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07a3cc48 authored by Stepan Moskovchenko's avatar Stepan Moskovchenko Committed by David Brown
Browse files

msm: Clean up useless ifdefs 



Remove ifdefs that do nothing, either from having the code
between them previously removed, or from having been
accidentally added to the wrong file.

Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent f689ac98

arch/arm/mach-msm/board-halibut.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -93,8 +93,6 @@ static void __init halibut_map_io(void) 
}

}





MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")

MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= 0x10000100,

	.boot_params	= 0x10000100,

	.fixup		= halibut_fixup,

	.fixup		= halibut_fixup,

	.map_io		= halibut_map_io,

	.map_io		= halibut_map_io,

arch/arm/mach-msm/board-mahimahi.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -74,8 +74,6 @@ static void __init mahimahi_map_io(void) 
extern struct sys_timer msm_timer;

extern struct sys_timer msm_timer;





MACHINE_START(MAHIMAHI, "mahimahi")

MACHINE_START(MAHIMAHI, "mahimahi")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= 0x20000100,

	.boot_params	= 0x20000100,

	.fixup		= mahimahi_fixup,

	.fixup		= mahimahi_fixup,

	.map_io		= mahimahi_map_io,

	.map_io		= mahimahi_map_io,

arch/arm/mach-msm/board-msm7x27.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -130,8 +130,6 @@ static void __init msm7x2x_map_io(void) 
}

}





MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF")

MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

	.init_irq	= msm7x2x_init_irq,
@@ -140,8 +138,6 @@ MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") 
MACHINE_END

MACHINE_END





MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA")

MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

	.init_irq	= msm7x2x_init_irq,
@@ -150,8 +146,6 @@ MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") 
MACHINE_END

MACHINE_END





MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF")

MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

	.init_irq	= msm7x2x_init_irq,
@@ -160,8 +154,6 @@ MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") 
MACHINE_END

MACHINE_END





MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA")

MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= PHYS_OFFSET + 0x100,

	.boot_params	= PHYS_OFFSET + 0x100,

	.map_io		= msm7x2x_map_io,

	.map_io		= msm7x2x_map_io,

	.init_irq	= msm7x2x_init_irq,

	.init_irq	= msm7x2x_init_irq,

arch/arm/mach-msm/board-msm7x30.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -105,8 +105,6 @@ static void __init msm7x30_map_io(void) 
}

}





MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")

MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.boot_params = PHYS_OFFSET + 0x100,

	.map_io = msm7x30_map_io,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,

	.init_irq = msm7x30_init_irq,
@@ -115,8 +113,6 @@ MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") 
MACHINE_END

MACHINE_END





MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")

MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.boot_params = PHYS_OFFSET + 0x100,

	.map_io = msm7x30_map_io,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,

	.init_irq = msm7x30_init_irq,
@@ -125,8 +121,6 @@ MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") 
MACHINE_END

MACHINE_END





MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")

MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.boot_params = PHYS_OFFSET + 0x100,

	.map_io = msm7x30_map_io,

	.map_io = msm7x30_map_io,

	.init_irq = msm7x30_init_irq,

	.init_irq = msm7x30_init_irq,

arch/arm/mach-msm/board-qsd8x50.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -116,8 +116,6 @@ static void __init qsd8x50_init(void) 
}

}





MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF")

MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.boot_params = PHYS_OFFSET + 0x100,

	.map_io = qsd8x50_map_io,

	.map_io = qsd8x50_map_io,

	.init_irq = qsd8x50_init_irq,

	.init_irq = qsd8x50_init_irq,
@@ -126,8 +124,6 @@ MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") 
MACHINE_END

MACHINE_END





MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5")

MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params = PHYS_OFFSET + 0x100,

	.boot_params = PHYS_OFFSET + 0x100,

	.map_io = qsd8x50_map_io,

	.map_io = qsd8x50_map_io,

	.init_irq = qsd8x50_init_irq,

	.init_irq = qsd8x50_init_irq,