diff options
author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-01 10:58:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-01 10:58:18 -0700 |
commit | 712fbdd33306aa07085d1e648b5f3d45d7943794 (patch) | |
tree | 5e8c905d983df3d54ae27e9c080fc6cfafe180eb /arch/ia64/pci/pci.c | |
parent | b25dd2842bcaef2413db7a06c67034b187aa007f (diff) | |
parent | 986632fd7033a0199f9548c44606377cdf1f4a80 (diff) |
Merge refs/heads/release from master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/pci/pci.c')
-rw-r--r-- | arch/ia64/pci/pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index f9472c50ab4..9977c122e9f 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -24,7 +24,6 @@ #include <asm/machvec.h> #include <asm/page.h> -#include <asm/segment.h> #include <asm/system.h> #include <asm/io.h> #include <asm/sal.h> |