1.1 --- a/xen/arch/ia64/xen/xensetup.c	Tue Feb 06 15:08:09 2007 -0700
     1.2 +++ b/xen/arch/ia64/xen/xensetup.c	Tue Feb 06 15:20:26 2007 -0700
     1.3 @@ -267,13 +267,16 @@ void start_kernel(void)
     1.4      early_setup_arch(&cmdline);
     1.5  
     1.6      /* We initialise the serial devices very early so we can get debugging. */
     1.7 -    if (running_on_sim) hpsim_serial_init();
     1.8 +    if (running_on_sim)
     1.9 +        hpsim_serial_init();
    1.10      else {
    1.11 -	ns16550_init(0, &ns16550_com1);
    1.12 -	/* Also init com2 for Tiger4. */
    1.13 -	ns16550_com2.io_base = 0x2f8;
    1.14 -	ns16550_com2.irq     = 3;
    1.15 -	ns16550_init(1, &ns16550_com2);
    1.16 +        ns16550_init(0, &ns16550_com1);
    1.17 +        if (ns16550_com1.io_base == 0x3f8) {
    1.18 +            /* Also init com2 for Tiger4. */
    1.19 +            ns16550_com2.io_base = 0x2f8;
    1.20 +            ns16550_com2.irq     = 3;
    1.21 +            ns16550_init(1, &ns16550_com2);
    1.22 +        }
    1.23      }
    1.24      serial_init_preirq();
    1.25