From 1244e8e3c5479037e3e210b6786117177ebb0bda Mon Sep 17 00:00:00 2001 From: Martyn Welch Date: Fri, 13 Mar 2009 11:35:08 +0000 Subject: [PATCH] --- yaml --- r: 138547 b: refs/heads/master c: 01ce8ef5e8abec5bda5ffdd9088dfa2b66c2a1dc h: refs/heads/master i: 138545: cdc7da78c3bcbb76632f1a15d15bcef0af47690c 138543: 96acadfae08f0e3f49557512dfcd4dcdfa18a7cc v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/86xx/gef_sbc310.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3f140c036418..7e48f5ab4e79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 563fdd4a0af509d8cb78901750f7d00db345d864 +refs/heads/master: 01ce8ef5e8abec5bda5ffdd9088dfa2b66c2a1dc diff --git a/trunk/arch/powerpc/platforms/86xx/gef_sbc310.c b/trunk/arch/powerpc/platforms/86xx/gef_sbc310.c index 0f20172af84b..ba3ce4381611 100644 --- a/trunk/arch/powerpc/platforms/86xx/gef_sbc310.c +++ b/trunk/arch/powerpc/platforms/86xx/gef_sbc310.c @@ -153,6 +153,10 @@ static void __init gef_sbc310_nec_fixup(struct pci_dev *pdev) { unsigned int val; + /* Do not do the fixup on other platforms! */ + if (!machine_is(gef_sbc310)) + return; + printk(KERN_INFO "Running NEC uPD720101 Fixup\n"); /* Ensure only ports 1 & 2 are enabled */