Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-bionic-kernel.git] / arch / arm / mach-davinci / board-neuros-osd2.c

diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 808233b60e3d0047e257227d50d49955c816228d..46f336fca80384541257e667383d85080b718b1b 100644 (file)
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -154,10 +154,6 @@ static struct platform_device *davinci_ntosd2_devices[] __initdata = {
        &ntosd2_leds_dev,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-       .enabled_uarts = (1 << 0),
-};
-
 static void __init davinci_ntosd2_map_io(void)
 {
        dm644x_init();
@@ -198,7 +194,7 @@ static __init void davinci_ntosd2_init(void)
        platform_add_devices(davinci_ntosd2_devices,
                                ARRAY_SIZE(davinci_ntosd2_devices));
 
-       davinci_serial_init(&uart_config);
+       davinci_serial_init(dm644x_serial_device);
        dm644x_init_asp(&dm644x_ntosd2_snd_data);
 
        soc_info->emac_pdata->phy_id = NEUROS_OSD2_PHY_ID;