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 / opp4xxx_data.c

diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c
index d470b728e72085b7bcfad5d24fdd9c0a0919cc97..1ef7a3e5ce4aba1e8de7a95461b8991c4517ef46 100644 (file)
--- a/arch/arm/mach-omap2/opp4xxx_data.c
+++ b/arch/arm/mach-omap2/opp4xxx_data.c
@@ -177,4 +177,4 @@ int __init omap4_opp_init(void)
                        ARRAY_SIZE(omap446x_opp_def_list));
        return r;
 }
-device_initcall(omap4_opp_init);
+omap_device_initcall(omap4_opp_init);