diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-29 17:14:40 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-29 17:14:40 -0400 |
| commit | 7d2e423addf3054a3238347740df6f46d4d83f3d (patch) | |
| tree | b850ced2f211b15bcb0ce4600a80b8b822d24a5e /arch | |
| parent | 3ec8a773d2775db86cc21d28b77bea29c8a1ea3c (diff) | |
| parent | a877bd36f7584fd7e4729099348cfc9190ba00aa (diff) | |
Pull asm-segment into release branch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/ia32/ia32_signal.c | 1 | ||||
| -rw-r--r-- | arch/ia64/pci/pci.c | 1 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/sn_hwperf.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/ia32/ia32_signal.c b/arch/ia64/ia32/ia32_signal.c index ebb89be2aa2d..aa891c9bc9b6 100644 --- a/arch/ia64/ia32/ia32_signal.c +++ b/arch/ia64/ia32/ia32_signal.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| 30 | #include <asm/rse.h> | 30 | #include <asm/rse.h> |
| 31 | #include <asm/sigcontext.h> | 31 | #include <asm/sigcontext.h> |
| 32 | #include <asm/segment.h> | ||
| 33 | 32 | ||
| 34 | #include "ia32priv.h" | 33 | #include "ia32priv.h" |
| 35 | 34 | ||
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index f9472c50ab42..9977c122e9fa 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include <asm/machvec.h> | 25 | #include <asm/machvec.h> |
| 26 | #include <asm/page.h> | 26 | #include <asm/page.h> |
| 27 | #include <asm/segment.h> | ||
| 28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
| 29 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 30 | #include <asm/sal.h> | 29 | #include <asm/sal.h> |
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 833e700fdac9..e28214216fee 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <asm/topology.h> | 36 | #include <asm/topology.h> |
| 37 | #include <asm/smp.h> | 37 | #include <asm/smp.h> |
| 38 | #include <asm/semaphore.h> | 38 | #include <asm/semaphore.h> |
| 39 | #include <asm/segment.h> | ||
| 40 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
| 41 | #include <asm/sal.h> | 40 | #include <asm/sal.h> |
| 42 | #include <asm/sn/io.h> | 41 | #include <asm/sn/io.h> |