Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-omap-h63xx.git] / arch / ia64 / hp / sim / hpsim_setup.c

diff --git a/arch/ia64/hp/sim/hpsim_setup.c b/arch/ia64/hp/sim/hpsim_setup.c
index f2297192a5825ab39ffe20e4b1b0c3cb15d08966..f629e903ebc787886ba786579e4852270e75d880 100644 (file)
--- a/arch/ia64/hp/sim/hpsim_setup.c
+++ b/arch/ia64/hp/sim/hpsim_setup.c
@@ -21,6 +21,7 @@
 #include <asm/machvec.h>
 #include <asm/pgtable.h>
 #include <asm/sal.h>
+#include <asm/hpsim.h>
 
 #include "hpsim_ssc.h"
 
@@ -41,11 +42,5 @@ hpsim_setup (char **cmdline_p)
 {
        ROOT_DEV = Root_SDA1;           /* default to first SCSI drive */
 
-#ifdef CONFIG_HP_SIMSERIAL_CONSOLE
-       {
-               extern struct console hpsim_cons;
-               if (ia64_platform_is("hpsim"))
-                       register_console(&hpsim_cons);
-       }
-#endif
+       simcons_register();
 }