Merge tag 'linux-kselftest-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / hdq1w.c

diff --git a/arch/arm/mach-omap2/hdq1w.c b/arch/arm/mach-omap2/hdq1w.c
index f3897d82e53e9ef2c894f8a6a826258608fce1b4..2bc4db23ca565240c0e0e55b93d587cd33593623 100644 (file)
--- a/arch/arm/mach-omap2/hdq1w.c
+++ b/arch/arm/mach-omap2/hdq1w.c
@@ -75,25 +75,3 @@ int omap_hdq1w_reset(struct omap_hwmod *oh)
 
        return 0;
 }
-
-#ifndef CONFIG_OF
-static int __init omap_init_hdq(void)
-{
-       int id = -1;
-       struct platform_device *pdev;
-       struct omap_hwmod *oh;
-       char *oh_name = "hdq1w";
-       char *devname = "omap_hdq";
-
-       oh = omap_hwmod_lookup(oh_name);
-       if (!oh)
-               return 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;
-}
-omap_arch_initcall(omap_init_hdq);
-#endif