diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:31:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 21:31:05 -0700 |
| commit | 075395d228641646159dae3dd170fa3fc6ff477a (patch) | |
| tree | 7cd5ace653d722549b23a2594140084c49bfcad6 /include | |
| parent | 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 (diff) | |
| parent | 61a116ef29e712147d7ee7a6738886e6f91df5f5 (diff) | |
| download | lwn-075395d228641646159dae3dd170fa3fc6ff477a.tar.gz lwn-075395d228641646159dae3dd170fa3fc6ff477a.zip | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Ensure 8250_pci quirks are not marked __devinit
[SERIAL] Convert fifosize to an unsigned int
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index fc1104a2cfa9..058cba70818a 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -216,10 +216,11 @@ struct uart_port { unsigned char __iomem *membase; /* read/write[bwl] */ unsigned int irq; /* irq number */ unsigned int uartclk; /* base uart clock */ - unsigned char fifosize; /* tx fifo size */ + unsigned int fifosize; /* tx fifo size */ unsigned char x_char; /* xon/xoff char */ unsigned char regshift; /* reg offset shift */ unsigned char iotype; /* io access style */ + unsigned char unused1; #define UPIO_PORT (0) #define UPIO_HUB6 (1) |