diff options
| author | Arnd Bergmann | 2011-08-26 17:27:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2011-08-26 17:27:34 +0200 |
| commit | 966843eb43cf90b1c6d3f56ecc96832bf6fb4b8f (patch) | |
| tree | e51ac58e325610f26e7a46a8cd109c4c598f59e3 | |
| parent | Merge branch 'samsung/fixes' of git+ssh://master.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | ARM: mach-footbridge: add missing header file <video/vga.h> (diff) | |
| download | kernel-qcow2-linux-966843eb43cf90b1c6d3f56ecc96832bf6fb4b8f.tar.gz kernel-qcow2-linux-966843eb43cf90b1c6d3f56ecc96832bf6fb4b8f.tar.xz kernel-qcow2-linux-966843eb43cf90b1c6d3f56ecc96832bf6fb4b8f.zip | |
Merge branch 'fixes' of git://git.jdl.com/software/linux-3.0 into fixes
| -rw-r--r-- | arch/arm/mach-footbridge/dc21285.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/pci.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index 1331fff51ae2..18c32a5541d9 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c @@ -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> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index a6eddae82a0b..c105556a0ee1 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c @@ -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; diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 28b8760ab9fa..bc4a920e26ee 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -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> |