diff options
author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /sound/ppc/pmac.c | |
parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) |
Merge from-linus to-akpm
Diffstat (limited to 'sound/ppc/pmac.c')
-rw-r--r-- | sound/ppc/pmac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 844d76152ea2..c89e82eb06a6 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -765,7 +765,8 @@ snd_pmac_ctrl_intr(int irq, void *devid, struct pt_regs *regs) | |||
765 | */ | 765 | */ |
766 | static void snd_pmac_sound_feature(pmac_t *chip, int enable) | 766 | static void snd_pmac_sound_feature(pmac_t *chip, int enable) |
767 | { | 767 | { |
768 | ppc_md.feature_call(PMAC_FTR_SOUND_CHIP_ENABLE, chip->node, 0, enable); | 768 | if (ppc_md.feature_call) |
769 | ppc_md.feature_call(PMAC_FTR_SOUND_CHIP_ENABLE, chip->node, 0, enable); | ||
769 | } | 770 | } |
770 | 771 | ||
771 | /* | 772 | /* |