diff options
author | Tony Luck <tony.luck@intel.com> | 2005-05-18 00:53:14 +0200 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-05-18 00:53:14 +0200 |
commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /sound/ppc/pmac.c | |
parent | [IA64] Merge audit fix for fsyscalls with syscall-optimizations (diff) | |
parent | [IA64] Fix convert_to_non_syscall() so gdb inferior calls work again (diff) | |
download | linux-325a479c4c110db278ef3361460a48c4093252cc.tar.xz linux-325a479c4c110db278ef3361460a48c4093252cc.zip |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'sound/ppc/pmac.c')
-rw-r--r-- | sound/ppc/pmac.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 3bf5f069a03d..32d94754acf8 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c @@ -986,7 +986,13 @@ static int __init snd_pmac_detect(pmac_t *chip) chip->num_freqs = ARRAY_SIZE(tumbler_freqs); chip->model = PMAC_SNAPPER; chip->can_byte_swap = 0; /* FIXME: check this */ - chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ + chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */ + break; + case 0x3a: + chip->num_freqs = ARRAY_SIZE(tumbler_freqs); + chip->model = PMAC_TOONIE; + chip->can_byte_swap = 0; /* FIXME: check this */ + chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */ break; } } |