diff options
| author | Jesse Barnes <jbarnes@sgi.com> | 2005-01-27 23:41:28 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-01-27 23:41:28 -0800 |
| commit | f64b9ffcd1fbd0a73749eea91b2a70930a2489bb (patch) | |
| tree | af9d9453c9015fb752825768b6322d57ef9b1bc3 | |
| parent | 8dd45bac7d75d8cdcdf6bd2c04c95fbd439c1897 (diff) | |
[IA64-SGI] move shubio.h into include/asm-ia64/sn/
We have a few drivers that want to include shubio.h, like mmtimer and the xp*
drivers. Moving it from arch/ia64/sn/include to include/asm-ia64/sn makes it
a little easier for drivers to get at.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/sn/kernel/bte.c | 2 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/bte_error.c | 2 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/huberror.c | 2 | ||||
| -rw-r--r-- | drivers/char/mmtimer.c | 4 | ||||
| -rw-r--r-- | include/asm-ia64/sn/shubio.h (renamed from arch/ia64/sn/include/shubio.h) | 0 |
5 files changed, 4 insertions, 6 deletions
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c index a9954bba176b..ce0bc4085eae 100644 --- a/arch/ia64/sn/kernel/bte.c +++ b/arch/ia64/sn/kernel/bte.c @@ -13,7 +13,7 @@ #include <asm/sn/arch.h> #include <asm/sn/sn_cpuid.h> #include <asm/sn/pda.h> -#include "shubio.h" +#include <asm/sn/shubio.h> #include <asm/nodedata.h> #include <asm/delay.h> diff --git a/arch/ia64/sn/kernel/bte_error.c b/arch/ia64/sn/kernel/bte_error.c index f1e463607873..fd104312c6bd 100644 --- a/arch/ia64/sn/kernel/bte_error.c +++ b/arch/ia64/sn/kernel/bte_error.c @@ -10,7 +10,7 @@ #include <asm/sn/sn_sal.h> #include "ioerror.h" #include <asm/sn/addrs.h> -#include "shubio.h" +#include <asm/sn/shubio.h> #include <asm/sn/geo.h> #include "xtalk/xwidgetdev.h" #include "xtalk/hubdev.h" diff --git a/arch/ia64/sn/kernel/huberror.c b/arch/ia64/sn/kernel/huberror.c index 118060460f47..2bdf684c5066 100644 --- a/arch/ia64/sn/kernel/huberror.c +++ b/arch/ia64/sn/kernel/huberror.c @@ -13,7 +13,7 @@ #include <asm/sn/sn_sal.h> #include "ioerror.h" #include <asm/sn/addrs.h> -#include "shubio.h" +#include <asm/sn/shubio.h> #include <asm/sn/geo.h> #include "xtalk/xwidgetdev.h" #include "xtalk/hubdev.h" diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index c254bf7bd9a8..3539b4acfc94 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c @@ -36,9 +36,7 @@ #include <asm/sn/intr.h> #include <asm/sn/shub_mmr.h> #include <asm/sn/nodepda.h> - -/* This is ugly and jbarnes has promised me to fix this later */ -#include "../../arch/ia64/sn/include/shubio.h" +#include <asm/sn/shubio.h> MODULE_AUTHOR("Jesse Barnes <jbarnes@sgi.com>"); MODULE_DESCRIPTION("SGI Altix RTC Timer"); diff --git a/arch/ia64/sn/include/shubio.h b/include/asm-ia64/sn/shubio.h index fbd880e6bb96..fbd880e6bb96 100644 --- a/arch/ia64/sn/include/shubio.h +++ b/include/asm-ia64/sn/shubio.h |