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 /include/asm-ia64 | |
| parent | 99a19cf1c0eb22bad83fff060f08330ee9e029e2 (diff) | |
| download | linux-8b713c67bccef7cabb0ee915f47eb33d82636af9.tar.gz linux-8b713c67bccef7cabb0ee915f47eb33d82636af9.tar.bz2 linux-8b713c67bccef7cabb0ee915f47eb33d82636af9.zip | |
[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 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/hpsim.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-ia64/hpsim.h b/include/asm-ia64/hpsim.h new file mode 100644 index 000000000000..d6be3fdc39fa --- /dev/null +++ b/include/asm-ia64/hpsim.h @@ -0,0 +1,10 @@ +#ifndef _ASMIA64_HPSIM_H +#define _ASMIA64_HPSIM_H + +#ifndef CONFIG_HP_SIMSERIAL_CONSOLE +static inline int simcons_register(void) { return 1; } +#else +int simcons_register(void); +#endif + +#endif |