tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Run sbc610 USB fixup code only on the appropriate platform.

Linus Torvalds 559595a9 5ad8b7d1

+4
unified split
+4
arch/powerpc/platforms/86xx/gef_sbc610.c
··· 142 { 143 unsigned int val; 144 145 printk(KERN_INFO "Running NEC uPD720101 Fixup\n"); 146 147 /* Ensure ports 1, 2, 3, 4 & 5 are enabled */
··· 142 { 143 unsigned int val; 144 145 + /* Do not do the fixup on other platforms! */ 146 + if (!machine_is(gef_sbc610)) 147 + return; 148 + 149 printk(KERN_INFO "Running NEC uPD720101 Fixup\n"); 150 151 /* Ensure ports 1, 2, 3, 4 & 5 are enabled */