Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 559595a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 5ad8b7d1 368a1211

arch/powerpc/platforms/86xx/gef_sbc610.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -142,6 +142,10 @@ static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev) 
{

{

	unsigned int val;

	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");

	printk(KERN_INFO "Running NEC uPD720101 Fixup\n");





	/* Ensure ports 1, 2, 3, 4 & 5 are enabled */

	/* Ensure ports 1, 2, 3, 4 & 5 are enabled */