diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-12-17 18:22:27 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-12-17 18:22:27 -0500 |
| commit | 376bddd34433065aeb9b9a140870537feecf90ef (patch) | |
| tree | a40e2b84ad89f4b3ba968de65a4bf7ff6ccae835 /sound/usb/endpoint.h | |
| parent | d526e85f60fce9aa2a1432cbd06e3cf20c1644c8 (diff) | |
| parent | 667b504a2c411e4d5915a6e2260a3857ba9f797a (diff) | |
Merge remote-tracking branch 'agust/next' into next
Brings some 52xx updates. Also manually merged tools/perf/perf.h.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'sound/usb/endpoint.h')
| -rw-r--r-- | sound/usb/endpoint.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h index 6376ccf10fd4..3d4c9705041f 100644 --- a/sound/usb/endpoint.h +++ b/sound/usb/endpoint.h | |||
| @@ -19,6 +19,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, | |||
| 19 | int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, int can_sleep); | 19 | int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, int can_sleep); |
| 20 | void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, | 20 | void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, |
| 21 | int force, int can_sleep, int wait); | 21 | int force, int can_sleep, int wait); |
| 22 | void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep); | ||
| 22 | int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep); | 23 | int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep); |
| 23 | int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep); | 24 | int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep); |
| 24 | void snd_usb_endpoint_free(struct list_head *head); | 25 | void snd_usb_endpoint_free(struct list_head *head); |