diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /include/linux/serialP.h | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'include/linux/serialP.h')
| -rw-r--r-- | include/linux/serialP.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/serialP.h b/include/linux/serialP.h index 8329b4580..d1f901262 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h @@ -24,6 +24,11 @@ #include <linux/tqueue.h> #include <linux/circ_buf.h> #include <linux/wait.h> +#if (LINUX_VERSION_CODE < 0x020300) +/* Unfortunate, but Linux 2.2 needs async_icount defined here and + * it got moved in 2.3 */ +#include <linux/serial.h> +#endif struct serial_state { int magic; @@ -190,6 +195,9 @@ struct pci_board_inst { /* Do not use irq sharing for this device */ #define SPCI_FL_NO_SHIRQ 0x1000 -#define SPCI_FL_PNPDEFAULT (SPCI_FL_IRQRESOURCE) +/* This is a PNP device */ +#define SPCI_FL_ISPNP 0x2000 + +#define SPCI_FL_PNPDEFAULT (SPCI_FL_IRQRESOURCE|SPCI_FL_ISPNP) #endif /* _LINUX_SERIAL_H */ |