diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /arch/arm/mach-integrator/pci.c | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/arm/mach-integrator/pci.c')
| -rw-r--r-- | arch/arm/mach-integrator/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/pci.c b/arch/arm/mach-integrator/pci.c index 520b6bf81bb..f1ca9c12286 100644 --- a/arch/arm/mach-integrator/pci.c +++ b/arch/arm/mach-integrator/pci.c @@ -26,11 +26,11 @@ #include <linux/interrupt.h> #include <linux/init.h> -#include <asm/irq.h> -#include <asm/system.h> #include <asm/mach/pci.h> #include <asm/mach-types.h> +#include <mach/irqs.h> + /* * A small note about bridges and interrupts. The DECchip 21050 (and * later) adheres to the PCI-PCI bridge specification. This says that |