diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 00:43:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 00:43:57 -0700 |
commit | ea3c4b126ad63bd782c7bb5266bb4fd88e203169 (patch) | |
tree | 1b1dedd3ee501c165910389aea9082fb96a9e8f4 /arch/ia64/hp/sim/hpsim_setup.c | |
parent | a5229e6b3fb77ef92ff585e17ba4aa8a3e945727 (diff) | |
parent | 7b3166dbc3df5b72f2ba4ea130f4461e318a3838 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
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 f2297192a58..f629e903ebc 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(); } |