diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
| commit | d61b04f801e6005182d432ebe4a0211c1d6feadd (patch) | |
| tree | aa085e56e1be528917212f41c485eebdfc072930 /include/sound | |
| parent | 30ff5957c3f1887d04ca01d839dc382739e48bde (diff) | |
| parent | 473f414564528a819f0c2bb6b4bf26366b64c9ab (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hdaudio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index e2b712c90d3f..c21c38ce7450 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -343,7 +343,7 @@ void snd_hdac_bus_enter_link_reset(struct hdac_bus *bus); void snd_hdac_bus_exit_link_reset(struct hdac_bus *bus); void snd_hdac_bus_update_rirb(struct hdac_bus *bus); -void snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status, +int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status, void (*ack)(struct hdac_bus *, struct hdac_stream *)); |