diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /drivers/usb/serial/ftdi_sio.h | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
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 { |