--- zzzz-none-000/linux-2.6.39.4/drivers/tty/serial/8250_pci.c 2011-08-03 19:43:28.000000000 +0000 +++ puma6-arm-6490-729/linux-2.6.39.4/drivers/tty/serial/8250_pci.c 2021-11-10 13:23:10.000000000 +0000 @@ -3796,11 +3796,13 @@ { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865, 0xA000, 0x3004, 0, 0, pbn_b0_bt_4_115200 }, + +#ifndef CONFIG_GEN3_UART /* Intel CE4100 */ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CE4100_UART, PCI_ANY_ID, PCI_ANY_ID, 0, 0, pbn_ce4100_1_115200 }, - +#endif /* * These entries match devices with class COMMUNICATION_SERIAL,