diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-04-26 10:04:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-04-26 10:12:46 +0200 |
| commit | a33d59599653edc6469c582f0ffd99c5fc58af04 (patch) | |
| tree | 3edf0d94ce44dc12139d90ff850bbf222e82db5e /include/sound/hda_i915.h | |
| parent | ALSA: au88x0: Fix overlapped PCM pointer (diff) | |
| parent | ALSA: hda - Update BCLK also at hotplug for i915 HSW/BDW (diff) | |
| download | linux-a33d59599653edc6469c582f0ffd99c5fc58af04.tar.xz linux-a33d59599653edc6469c582f0ffd99c5fc58af04.zip | |
Merge branch 'for-linus' into for-next
For taking back the recent change of HDA HDMI fixes for i915 HSW/BDW.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/hda_i915.h')
| -rw-r--r-- | include/sound/hda_i915.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/sound/hda_i915.h b/include/sound/hda_i915.h index eed87a7559b7..796cabf6be5e 100644 --- a/include/sound/hda_i915.h +++ b/include/sound/hda_i915.h @@ -9,7 +9,7 @@ #ifdef CONFIG_SND_HDA_I915 int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable); int snd_hdac_display_power(struct hdac_bus *bus, bool enable); -int snd_hdac_get_display_clk(struct hdac_bus *bus); +void snd_hdac_i915_set_bclk(struct hdac_bus *bus); int snd_hdac_sync_audio_rate(struct hdac_device *codec, hda_nid_t nid, int rate); int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid, bool *audio_enabled, char *buffer, int max_bytes); @@ -25,9 +25,8 @@ static inline int snd_hdac_display_power(struct hdac_bus *bus, bool enable) { return 0; } -static inline int snd_hdac_get_display_clk(struct hdac_bus *bus) +static inline void snd_hdac_i915_set_bclk(struct hdac_bus *bus) { - return 0; } static inline int snd_hdac_sync_audio_rate(struct hdac_device *codec, hda_nid_t nid, int rate) |