Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 73ae7536a32b7bd24040e385dc218027e5b7c600..5c5315ba129b705b4af0c6b9f8af38e217e922cd 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -530,12 +530,12 @@ static int __init omap2_init_devices(void)
                omap_init_mcspi();
                omap_init_sham();
                omap_init_aes();
+               omap_init_rng();
        } else {
                /* These can be removed when bindings are done */
                omap_init_wl12xx_of();
        }
        omap_init_sti();
-       omap_init_rng();
        omap_init_vout();
 
        return 0;