diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:04:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:04:08 -0400 |
| commit | d498a2c76568d3bb5add06390f077b1a423b0794 (patch) | |
| tree | f4934ce0c29b559d30655d5c4f6702ccda7aaf61 /include/linux | |
| parent | 8b789b7d7e9b12b086d6d2f0759073a11447c7e7 (diff) | |
| parent | ec9f47cd6a14ca069bb7552a984c0a338fc7262b (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/serial_8250.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index 823181af6ddf..3e3c1fa35b06 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h | |||
| @@ -22,6 +22,7 @@ struct plat_serial8250_port { | |||
| 22 | unsigned int uartclk; /* UART clock rate */ | 22 | unsigned int uartclk; /* UART clock rate */ |
| 23 | unsigned char regshift; /* register shift */ | 23 | unsigned char regshift; /* register shift */ |
| 24 | unsigned char iotype; /* UPIO_* */ | 24 | unsigned char iotype; /* UPIO_* */ |
| 25 | unsigned char hub6; | ||
| 25 | unsigned int flags; /* UPF_* flags */ | 26 | unsigned int flags; /* UPF_* flags */ |
| 26 | }; | 27 | }; |
| 27 | 28 | ||