Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[pandora-kernel.git] / arch / arm / plat-mxc / system.c

diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c
index 3455fc0..8024f2a 100644 (file)
--- a/arch/arm/plat-mxc/system.c
+++ b/arch/arm/plat-mxc/system.c
@@ -37,12 +37,6 @@ void arch_reset(char mode, const char *cmd)
 {
        unsigned int wcr_enable;
 
-#ifdef CONFIG_ARCH_MXC91231
-       if (cpu_is_mxc91231()) {
-               mxc91231_arch_reset(mode, cmd);
-               return;
-       }
-#endif
 #ifdef CONFIG_MACH_MX51_EFIKAMX
        if (machine_is_mx51_efikamx()) {
                mx51_efikamx_reset();