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

torvalds · torvalds · commit 559595a985e1 · 2009-03-04T07:49:07.000-08:00
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Run sbc610 USB fixup code only on the appropriate platform.
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -142,6 +142,10 @@ static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev)
 {
 	unsigned int val;
 
+	/* Do not do the fixup on other platforms! */
+	if (!machine_is(gef_sbc610))
+		return;
+
 	printk(KERN_INFO "Running NEC uPD720101 Fixup\n");
 
 	/* Ensure ports 1, 2, 3, 4 & 5 are enabled */

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,10 @@ static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev)`
`142`	`142`	`{`
`143`	`143`	`unsigned int val;`
`144`	`144`
	`145`	`+ /* Do not do the fixup on other platforms! */`
	`146`	`+ if (!machine_is(gef_sbc610))`
	`147`	`+ return;`
	`148`	`+`
`145`	`149`	`printk(KERN_INFO "Running NEC uPD720101 Fixup\n");`
`146`	`150`
`147`	`151`	`/* Ensure ports 1, 2, 3, 4 & 5 are enabled */`