diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-10-08 09:30:04 +0200 |
commit | d820306cbe56fb010f500ae58f9725f49812d39a (patch) | |
tree | 1c9554107c7f279d05d6f54b1b5d69735d51195d /arch/mips/bcm63xx | |
parent | ALSA: usb-audio: support wireless devices in snd_usb_parse_datainterval (diff) | |
parent | ALSA: hda - hdmi: Fix channel map switch not taking effect (diff) | |
download | linux-d820306cbe56fb010f500ae58f9725f49812d39a.tar.xz linux-d820306cbe56fb010f500ae58f9725f49812d39a.zip |
Merge branch 'for-linus' into for-next
For updating the HDMI chmap fix.
Conflicts:
sound/pci/hda/patch_hdmi.c
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r-- | arch/mips/bcm63xx/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c index 7e17374a9ae8..b713cd64b087 100644 --- a/arch/mips/bcm63xx/cpu.c +++ b/arch/mips/bcm63xx/cpu.c @@ -306,14 +306,14 @@ void __init bcm63xx_cpu_init(void) switch (c->cputype) { case CPU_BMIPS3300: - if ((read_c0_prid() & 0xff00) != PRID_IMP_BMIPS3300_ALT) + if ((read_c0_prid() & PRID_IMP_MASK) != PRID_IMP_BMIPS3300_ALT) __cpu_name[cpu] = "Broadcom BCM6338"; /* fall-through */ case CPU_BMIPS32: chipid_reg = BCM_6345_PERF_BASE; break; case CPU_BMIPS4350: - switch ((read_c0_prid() & 0xff)) { + switch ((read_c0_prid() & PRID_REV_MASK)) { case 0x04: chipid_reg = BCM_3368_PERF_BASE; break; |