---

yaml
---
r: 16139
b: refs/heads/master
c: 7cd01dd
h: refs/heads/master
i:
  16137: 2de5cdf
  16135: 87e9e50
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d70d91c4663d580bd18317dac3c7dc3bee79480
+refs/heads/master: 7cd01dd840824e7c6023ad1dbfdb94a2183a7adb

trunk/sound/ppc/pmac.c

@@ -973,11 +973,11 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
 		 * single frequency until proper i2s control is implemented
 		 */
 		switch(layout_id) {
-		case 0x48:
-		case 0x46:
-		case 0x33:
-		case 0x29:
 		case 0x24:
+		case 0x29:
+		case 0x33:
+		case 0x46:
+		case 0x48:
 		case 0x50:
 		case 0x5c:
 			chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
@@ -986,6 +986,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
 			chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
 			break;
 		case 0x3a:
+		case 0x40:
 			chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
 			chip->model = PMAC_TOONIE;
 			chip->can_byte_swap = 0; /* FIXME: check this */