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

Commit 966843eb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes' of git://git.jdl.com/software/linux-3.0 into fixes

parents 4a3f4233 9fc2071a

arch/arm/mach-footbridge/dc21285.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/irq.h>

#include <linux/io.h>

#include <linux/spinlock.h>

#include <video/vga.h>



#include <asm/irq.h>

#include <asm/system.h>

arch/arm/mach-orion5x/dns323-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
	/*

	 * Check for devices with hard-wired IRQs.

	 */

	irq = orion5x_pci_map_irq(const dev, slot, pin);

	irq = orion5x_pci_map_irq(dev, slot, pin);

	if (irq != -1)

		return irq;

arch/arm/mach-orion5x/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/pci.h>

#include <linux/slab.h>

#include <linux/mbus.h>

#include <video/vga.h>

#include <asm/irq.h>

#include <asm/mach/pci.h>

#include <plat/pcie.h>