diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:31:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:31:54 -0500 |
| commit | d195ea4b1456192abe780fd773778cbe9f6d77ea (patch) | |
| tree | 25ea330c4fced145290f6f5cfb1b06a1cf8402c0 /include/linux/serial_8250.h | |
| parent | bb4bc81a234c66e8d8a4475110fa2d7988a34671 (diff) | |
| parent | df7559d3440ff759ff6e1371ff722bb3a73a3639 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include/linux/serial_8250.h')
| -rw-r--r-- | include/linux/serial_8250.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index cee302aefdb7..73b464f0926a 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h | |||
| @@ -26,7 +26,7 @@ struct plat_serial8250_port { | |||
| 26 | unsigned char regshift; /* register shift */ | 26 | unsigned char regshift; /* register shift */ |
| 27 | unsigned char iotype; /* UPIO_* */ | 27 | unsigned char iotype; /* UPIO_* */ |
| 28 | unsigned char hub6; | 28 | unsigned char hub6; |
| 29 | unsigned int flags; /* UPF_* flags */ | 29 | upf_t flags; /* UPF_* flags */ |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | /* | 32 | /* |