Merge bk://are.twiddle.net/axp-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
8b0e2342 · Linus Torvalds · 76ffe688 · c3edf1f1 · 8b0e2342
Commit 8b0e2342 authored Dec 13, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

include/asm-alpha/pci.h include/asm-alpha/pci.h +0 -2

No files found.
--- a/include/asm-alpha/pci.h
+++ b/include/asm-alpha/pci.h
@@ -6,8 +6,6 @@
 #include <linux/spinlock.h>
 #include <asm/scatterlist.h>
 #include <asm/machvec.h>
-#include <asm/io.h>
-

 /*
 * The following structure is used to manage multiple PCI busses.