diff options
| -rw-r--r-- | drivers/char/rtc.c | 1 | ||||
| -rw-r--r-- | drivers/char/serial.c | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 994ff4455..95c188e83 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -62,7 +62,6 @@ #include <linux/poll.h> #include <linux/proc_fs.h> #include <linux/spinlock.h> -#include <linux/rtc.h> #include <asm/io.h> #include <asm/uaccess.h> diff --git a/drivers/char/serial.c b/drivers/char/serial.c index 4d3a5a8f8..eeb82a033 100644 --- a/drivers/char/serial.c +++ b/drivers/char/serial.c @@ -4180,6 +4180,16 @@ static struct pci_board pci_boards[] __initdata = { { PCI_VENDOR_ID_ROCKWELL, 0x1004, 0x1048, 0x1500, SPCI_FL_BASE1, 1, 115200 }, +#ifdef CONFIG_DDB5074 + /* + * NEC Vrc-5074 (Nile 4) builtin UART. + * Conditionally compiled in since this is a motherboard device. + */ + { PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NILE4, + PCI_ANY_ID, PCI_ANY_ID, + SPCI_FL_BASE0, 1, 520833, + 64, 3, NULL, 0x300 }, +#endif /* Generic serial board */ { 0, 0, 0, 0, |