Commit e305ec80 authored by Paul Mundt's avatar Paul Mundt

sh: rts7751r2d: Kill off unneeded ifdefs.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent a1dc4b59
...@@ -109,7 +109,6 @@ static struct platform_device heartbeat_device = { ...@@ -109,7 +109,6 @@ static struct platform_device heartbeat_device = {
.resource = heartbeat_resources, .resource = heartbeat_resources,
}; };
#ifdef CONFIG_MFD_SM501
static struct plat_serial8250_port uart_platform_data[] = { static struct plat_serial8250_port uart_platform_data[] = {
{ {
.membase = (void __iomem *)0xb3e30000, .membase = (void __iomem *)0xb3e30000,
...@@ -208,13 +207,9 @@ static struct platform_device sm501_device = { ...@@ -208,13 +207,9 @@ static struct platform_device sm501_device = {
.resource = sm501_resources, .resource = sm501_resources,
}; };
#endif /* CONFIG_MFD_SM501 */
static struct platform_device *rts7751r2d_devices[] __initdata = { static struct platform_device *rts7751r2d_devices[] __initdata = {
#ifdef CONFIG_MFD_SM501
&uart_device, &uart_device,
&sm501_device, &sm501_device,
#endif
&heartbeat_device, &heartbeat_device,
&spi_sh_sci_device, &spi_sh_sci_device,
}; };
...@@ -234,7 +229,9 @@ static int __init rts7751r2d_devices_setup(void) ...@@ -234,7 +229,9 @@ static int __init rts7751r2d_devices_setup(void)
{ {
if (register_trapped_io(&cf_trapped_io) == 0) if (register_trapped_io(&cf_trapped_io) == 0)
platform_device_register(&cf_ide_device); platform_device_register(&cf_ide_device);
spi_register_board_info(spi_bus, ARRAY_SIZE(spi_bus)); spi_register_board_info(spi_bus, ARRAY_SIZE(spi_bus));
return platform_add_devices(rts7751r2d_devices, return platform_add_devices(rts7751r2d_devices,
ARRAY_SIZE(rts7751r2d_devices)); ARRAY_SIZE(rts7751r2d_devices));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment