diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-13 01:12:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-13 01:12:00 -0800 |
| commit | 8b0e23429e51edd0e71407afa21a54276a14aa55 (patch) | |
| tree | 88ae054c1691b50cb1b823d7fcf0e451f0bfe0e5 /include | |
| parent | 76ffe688b57868d056d01a96790409b7f1bd8245 (diff) | |
| parent | c3edf1f113eacc5647586e43f26df089e72c3731 (diff) | |
Merge bk://are.twiddle.net/axp-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h index 60af31abecd6..ae1e9c9a2c44 100644 --- 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. |