diff options
author | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 19:41:44 +0200 |
commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /arch/i386/mach-visws/visws_apic.c | |
parent | [PATCH] Removed remaining PCI specific references from swiotlb.c (diff) | |
parent | [PATCH] Fix handling spurious page fault for hugetlb region (diff) | |
download | linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.tar.xz linux-9cec58dc138d6fcad9f447a19c8ff69f6540e667.zip |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/i386/mach-visws/visws_apic.c')
-rw-r--r-- | arch/i386/mach-visws/visws_apic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/i386/mach-visws/visws_apic.c index 04e6585849a2..3e64fb721291 100644 --- a/arch/i386/mach-visws/visws_apic.c +++ b/arch/i386/mach-visws/visws_apic.c @@ -19,7 +19,6 @@ #include <linux/config.h> #include <linux/kernel_stat.h> #include <linux/interrupt.h> -#include <linux/irq.h> #include <linux/smp_lock.h> #include <linux/init.h> |