diff options
author | Peter Chubb <peterc@chubb.wattle.id.au> | 2007-08-21 13:51:45 +1000 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-09-01 02:50:39 -0700 |
commit | 8b713c67bccef7cabb0ee915f47eb33d82636af9 (patch) | |
tree | 73a0577c8dd70825eaa41dc4527ab09432418166 /arch/ia64/hp/sim/hpsim_setup.c | |
parent | 99a19cf1c0eb22bad83fff060f08330ee9e029e2 (diff) | |
download | op-kernel-dev-8b713c67bccef7cabb0ee915f47eb33d82636af9.zip op-kernel-dev-8b713c67bccef7cabb0ee915f47eb33d82636af9.tar.gz |
[IA64] Enable early console for Ski simulator
This patch cleans up the `enable early console for SKI' patch
(471e7a44848f467c9b83adc3463d019d2fa8817f), and
1. potentially allows the gensparse_defconfig to work again.
(there are other problems running a generic kernel on Ski)
2. fixes the `console registered twice' problem.
3. Cleans up the code by moving the `extern hpsim_cons' declaration to
a new asm/hpsim.h file.
Thanks to Jes for comments.
Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/hp/sim/hpsim_setup.c')
-rw-r--r-- | arch/ia64/hp/sim/hpsim_setup.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/ia64/hp/sim/hpsim_setup.c b/arch/ia64/hp/sim/hpsim_setup.c index f229719..f629e90 100644 --- 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(); } |