summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-04 07:49:07 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-04 07:49:07 -0800
commit559595a985e106d2fa9f0c79b7f5805453fed593 (patch)
tree88758ce2126d1cf240f4f93ea98d52bf1e21ce6c
parent5ad8b7d12605e88d1e532061699102797fdefe08 (diff)
parent368a12117dd8abf6eaefa37c21ac313b517128b9 (diff)
downloadop-kernel-dev-559595a985e106d2fa9f0c79b7f5805453fed593.zip
op-kernel-dev-559595a985e106d2fa9f0c79b7f5805453fed593.tar.gz
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.
-rw-r--r--arch/powerpc/platforms/86xx/gef_sbc610.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index fb371f5..d6b772b 100644
--- 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 */
OpenPOWER on IntegriCloud