diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-06 05:33:17 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-06 05:33:17 -0700 |
| commit | ae745302c0a3e2b5b768690f631fc14db44467e7 (patch) | |
| tree | 1db4d210a7419286b447dc09fa7400a561d55f42 /arch/alpha/kernel/sys_nautilus.c | |
| parent | e3abe2556b2a689b28926cd1581f0b97e9d2afa4 (diff) | |
| parent | 22a5dc10e3f8fb8370748ea19dc4e3e1620d8296 (diff) | |
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'arch/alpha/kernel/sys_nautilus.c')
| -rw-r--r-- | arch/alpha/kernel/sys_nautilus.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index 700686d04869..2cfaa0e5c577 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c @@ -39,7 +39,6 @@ #include <asm/irq.h> #include <asm/mmu_context.h> #include <asm/io.h> -#include <asm/pci.h> #include <asm/pgtable.h> #include <asm/core_irongate.h> #include <asm/hwrpb.h> |