diff options
| author | Patrick Simianer <p@simianer.de> | 2018-06-07 19:30:22 +0200 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2018-06-07 19:30:22 +0200 |
| commit | 1f8315a722924d1f0e760499ad1bc6753f820afe (patch) | |
| tree | 856494dbc590665eaaf55ab44dab832a326a3f18 /config | |
| parent | 72e1c4eedc30ef359a04f387eb1bc506f3f3e709 (diff) | |
| parent | 24e2cab3ea773c0e5fe60c7223e65d22f6ef4b4b (diff) | |
merge
Diffstat (limited to 'config')
| -rw-r--r-- | config | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -2612,7 +2612,10 @@ CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_SERIAL_EDGEPORT is not set # CONFIG_USB_SERIAL_EDGEPORT_TI is not set # CONFIG_USB_SERIAL_F81232 is not set +<<<<<<< HEAD # CONFIG_USB_SERIAL_F8153X is not set +======= +>>>>>>> 24e2cab3ea773c0e5fe60c7223e65d22f6ef4b4b # CONFIG_USB_SERIAL_GARMIN is not set # CONFIG_USB_SERIAL_IPW is not set # CONFIG_USB_SERIAL_IUU is not set @@ -2644,7 +2647,10 @@ CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_SERIAL_WISHBONE is not set # CONFIG_USB_SERIAL_SSU100 is not set # CONFIG_USB_SERIAL_QT2 is not set +<<<<<<< HEAD # CONFIG_USB_SERIAL_UPD78F0730 is not set +======= +>>>>>>> 24e2cab3ea773c0e5fe60c7223e65d22f6ef4b4b CONFIG_USB_SERIAL_DEBUG=m # |