Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10

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

diff --git a/arch/arm/mach-omap2/hdq1w.c b/arch/arm/mach-omap2/hdq1w.c
index ab7bf181a1052feb452f26efe34ca2089a291398..cbc8e3c480e0fc23fd0a87e897584f3bc27b2b92 100644 (file)
--- a/arch/arm/mach-omap2/hdq1w.c
+++ b/arch/arm/mach-omap2/hdq1w.c
@@ -27,6 +27,7 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 
+#include "soc.h"
 #include "omap_hwmod.h"
 #include "omap_device.h"
 #include "hdq1w.h"
@@ -87,10 +88,10 @@ static int __init omap_init_hdq(void)
        if (!oh)
                return 0;
 
-       pdev = omap_device_build(devname, id, oh, NULL, 0, NULL, 0, 0);
+       pdev = omap_device_build(devname, id, oh, NULL, 0);
        WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
             devname, oh->name);
 
        return 0;
 }
-arch_initcall(omap_init_hdq);
+omap_arch_initcall(omap_init_hdq);