Merge tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm...
authorDave Airlie <airlied@redhat.com>
Tue, 10 Apr 2018 22:35:18 +0000 (08:35 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 10 Apr 2018 22:35:18 +0000 (08:35 +1000)
hda_intel: Don't declare azx PM ops if VGA_SWITCHEROO configured (Lukas)

Cc: Lukas Wunner <lukas@wunner.de>
Cc: Takashi Iwai <tiwai@suse.de>
* tag 'drm-misc-next-fixes-2018-04-04' of git://anongit.freedesktop.org/drm/drm-misc:
  ALSA: hda - Silence PM ops build warning

1  2 
sound/pci/hda/hda_intel.c

Simple merge