diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
| commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
| tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /sound/usb/usbaudio.h | |
| parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
Merge branch 'master'
Diffstat (limited to 'sound/usb/usbaudio.h')
| -rw-r--r-- | sound/usb/usbaudio.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index ad9eab211d8f..b5802022bb19 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h | |||
| @@ -249,14 +249,6 @@ void snd_usbmidi_disconnect(struct list_head *p); | |||
| 249 | #define get_cfg_desc(cfg) (&(cfg)->desc) | 249 | #define get_cfg_desc(cfg) (&(cfg)->desc) |
| 250 | #endif | 250 | #endif |
| 251 | 251 | ||
| 252 | #ifndef usb_pipe_needs_resubmit | ||
| 253 | #define usb_pipe_needs_resubmit(pipe) 1 | ||
| 254 | #endif | ||
| 255 | |||
| 256 | #ifndef snd_usb_complete_callback | ||
| 257 | #define snd_usb_complete_callback(x) (x) | ||
| 258 | #endif | ||
| 259 | |||
| 260 | #ifndef snd_usb_get_speed | 252 | #ifndef snd_usb_get_speed |
| 261 | #define snd_usb_get_speed(dev) ((dev)->speed) | 253 | #define snd_usb_get_speed(dev) ((dev)->speed) |
| 262 | #endif | 254 | #endif |