diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-12 10:34:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 10:34:27 +0100 |
| commit | c4d1489390aa0be73104fc502a1e3107511c8926 (patch) | |
| tree | 35adb98c98dea53be86cf8be6d15e80e2e0f52c6 /sound/pci/hda/hda_intel.c | |
| parent | a8dca4604a13469892c77c25638691d7757e7a47 (diff) | |
| parent | ef8e39b51f24c8ac907e1f1995910ee3083375e0 (diff) | |
| download | linux-stable-c4d1489390aa0be73104fc502a1e3107511c8926.tar.gz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 17c83fbc9f84..d8d9bf3c3787 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -198,7 +198,7 @@ MODULE_DESCRIPTION("Intel HDA driver"); #endif #if defined(CONFIG_PM) && defined(CONFIG_VGA_SWITCHEROO) -#ifdef CONFIG_SND_HDA_CODEC_HDMI +#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI) #define SUPPORT_VGA_SWITCHEROO #endif #endif |