Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / arm / mach-omap2 / serial.c

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 04fdbc4c499bb9d85b1ff920e46ede6d11891a69..8396b5b7e912d91e48adbcc3b785041845b9f677 100644 (file)
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -254,7 +254,7 @@ static int __init omap_serial_early_init(void)
 
        return 0;
 }
-core_initcall(omap_serial_early_init);
+omap_core_initcall(omap_serial_early_init);
 
 /**
  * omap_serial_init_port() - initialize single serial port
@@ -316,8 +316,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
        if (WARN_ON(!oh))
                return;
 
-       pdev = omap_device_build(name, uart->num, oh, pdata, pdata_size,
-                                NULL, 0, false);
+       pdev = omap_device_build(name, uart->num, oh, pdata, pdata_size);
        if (IS_ERR(pdev)) {
                WARN(1, "Could not build omap_device for %s: %s.\n", name,
                     oh->name);