diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-07-19 20:48:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-07-19 20:48:14 +0200 |
| commit | 7abeb64da6deeffa52f74e3b1e19d2c9e2c3ae6b (patch) | |
| tree | a642c137668c6b4a9e24f42798abe15c16d0ef0f /include/sound/hdaudio.h | |
| parent | ALSA: usb-audio: Allow changing from a bad sample rate (diff) | |
| parent | ALSA: hda: Make audio component support more generic (diff) | |
| download | linux-7abeb64da6deeffa52f74e3b1e19d2c9e2c3ae6b.tar.xz linux-7abeb64da6deeffa52f74e3b1e19d2c9e2c3ae6b.zip | |
Merge branch 'topic/drm_audio_component' into for-next
Pull the generic drm_audio_component support, which will be used later
for AMD/ATI and other HD-audio HDMI codec drivers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/hdaudio.h')
| -rw-r--r-- | include/sound/hdaudio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 21abc4da2549..8305e7971035 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -360,9 +360,9 @@ struct hdac_bus { spinlock_t reg_lock; struct mutex cmd_mutex; - /* i915 component interface */ - struct i915_audio_component *audio_component; - int i915_power_refcount; + /* DRM component interface */ + struct drm_audio_component *audio_component; + int drm_power_refcount; /* parameters required for enhanced capabilities */ int num_streams; |