> +#ifdef CONFIG_CPU_CAVIUM_OCTEON > + /* UPF_FIXED_PORT indicates an internal UART. */ > + if (up->port.flags & UPF_FIXED_PORT) > + up->port.type = PORT_OCTEON; > + else > +#endif Not nice. Please keep CPU specific ifdefs out of the 8250 core code. Can you not set a port flag for UPF_BROKEN_OCTEON or similar to clean that up and also make the other tests that need things doing (eg the always calling IRQ code use port flags of a more generic nature ?)