diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 16:27:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 16:27:36 -0500 |
| commit | 9f9cba810f36d16f4e64477e879a69f6c47b389d (patch) | |
| tree | d787abcbead1439d3f82f0719efe520fd9689f79 /sound/usb/quirks-table.h | |
| parent | dbf5bef8da169b38db804996a661f8d634df8295 (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge 3.8-rc5 into tty-next
This resolves a number of tty driver merge issues found in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/usb/quirks-table.h')
| -rw-r--r-- | sound/usb/quirks-table.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 78e845ec65da..64d25a7a4d59 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h | |||
| @@ -2289,7 +2289,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 2289 | .rate_table = (unsigned int[]) { | 2289 | .rate_table = (unsigned int[]) { |
| 2290 | 44100, 48000, 88200, 96000 | 2290 | 44100, 48000, 88200, 96000 |
| 2291 | }, | 2291 | }, |
| 2292 | .clock = 0x81, | 2292 | .clock = 0x80, |
| 2293 | } | 2293 | } |
| 2294 | }, | 2294 | }, |
| 2295 | /* Capture */ | 2295 | /* Capture */ |
| @@ -2315,7 +2315,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 2315 | .rate_table = (unsigned int[]) { | 2315 | .rate_table = (unsigned int[]) { |
| 2316 | 44100, 48000, 88200, 96000 | 2316 | 44100, 48000, 88200, 96000 |
| 2317 | }, | 2317 | }, |
| 2318 | .clock = 0x81, | 2318 | .clock = 0x80, |
| 2319 | } | 2319 | } |
| 2320 | }, | 2320 | }, |
| 2321 | /* MIDI */ | 2321 | /* MIDI */ |