Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[linux-2.6-block.git] / arch / arm / kernel / setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 9e0fdb3a1988ea549442f5c1369e209ab3f44164..b91411371ae19b1ae75c2184b4b26ec6c9b06193 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -976,7 +976,6 @@ void __init setup_arch(char **cmdline_p)
        conswitchp = &dummy_con;
 #endif
 #endif
-       early_trap_init();
 
        if (mdesc->init_early)
                mdesc->init_early();