diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/usb/serial/ftdi_sio.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.h')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 213fe3d61282..19584faa86f9 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -156,7 +156,8 @@ enum ftdi_chip_type { | |||
| 156 | FT2232C = 4, | 156 | FT2232C = 4, |
| 157 | FT232RL = 5, | 157 | FT232RL = 5, |
| 158 | FT2232H = 6, | 158 | FT2232H = 6, |
| 159 | FT4232H = 7 | 159 | FT4232H = 7, |
| 160 | FT232H = 8 | ||
| 160 | }; | 161 | }; |
| 161 | 162 | ||
| 162 | enum ftdi_sio_baudrate { | 163 | enum ftdi_sio_baudrate { |