]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc: Run sbc610 USB fixup code only on the appropriate platform.
authorTony Breeds <tony@bakeyournoodle.com>
Tue, 3 Mar 2009 17:59:30 +0000 (17:59 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 4 Mar 2009 06:36:52 +0000 (17:36 +1100)
commit a969e76a7101bf5f3d369563df1ca1253dd6131b (powerpc: Correct USB
support for GE Fanuc SBC610) introduced a fixup for NEC usb controllers.
This fixup should only run on GEF SBC610 boards.

Fixes Fedora bug #486511.
(https://bugzilla.redhat.com/show_bug.cgi?id=486511)

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/86xx/gef_sbc610.c

index fb371f5ce132c657ab910824d6d4c998b59c574d..d6b772ba3b8f8238ea3ecd5d27c2b77843b9dcda 100644 (file)
@@ -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 */