diff --git a/[refs] b/[refs] index 99f51aff408d..06f558678f94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3e9c5e7096f6379ca8fa78413b2055fa29f4530 +refs/heads/master: e167280070cccd2e0cde94f73ded0a4b08bf6412 diff --git a/trunk/sound/pci/intel8x0.c b/trunk/sound/pci/intel8x0.c index b37bd268301f..b13ef1e2a4a3 100644 --- a/trunk/sound/pci/intel8x0.c +++ b/trunk/sound/pci/intel8x0.c @@ -2317,7 +2317,7 @@ static int snd_intel8x0_ich_chip_cold_reset(struct intel8x0 *chip) #define snd_intel8x0_ich_chip_can_cold_reset(chip) \ (!snd_pci_quirk_lookup(chip->pci, ich_chip_reset_mode)) #else -#define snd_intel8x0_ich_chip_cold_reset(x) do { } while (0) +#define snd_intel8x0_ich_chip_cold_reset(chip) 0 #define snd_intel8x0_ich_chip_can_cold_reset(chip) (0) #endif