Merge commit 'v2.6.29-rc1' into perfcounters/core

[~andy/linux] / arch / sparc / prom / misc_32.c

diff --git a/arch/sparc/prom/misc_32.c b/arch/sparc/prom/misc_32.c
index 49b5057b9601000660e42220eb5e49d565f83604..cf6c3f6d36c3d6bdecc41edc37aa3436e1a1726e 100644 (file)
--- a/arch/sparc/prom/misc_32.c
+++ b/arch/sparc/prom/misc_32.c
@@ -61,9 +61,7 @@ prom_cmdline(void)
        restore_current();
        install_linux_ticker();
        spin_unlock_irqrestore(&prom_lock, flags);
-#ifdef CONFIG_SUN_AUXIO
        set_auxio(AUXIO_LED, 0);
-#endif
 }
 
 /* Drop into the prom, but completely terminate the program.