diff options
| author | Kelly Daly <kelly@au.ibm.com> | 2005-11-01 08:59:20 +0300 |
|---|---|---|
| committer | Kelly Daly <kelly@au.ibm.com> | 2005-11-01 08:59:20 +0300 |
| commit | 1da44037883c0405154d53fe76da27e078456664 (patch) | |
| tree | db6f579831b89c55e0e0c095345b4d1e5bdd0500 | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
| download | linux-1da44037883c0405154d53fe76da27e078456664.tar.xz | |
merge filename and modify references to iseries/hv_call.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
| -rw-r--r-- | arch/powerpc/lib/locks.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/hvlog.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/smp.c | 2 | ||||
| -rw-r--r-- | drivers/char/viocons.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/iseries/hv_call.h (renamed from include/asm-ppc64/iSeries/HvCall.h) | 0 | ||||
| -rw-r--r-- | include/asm-powerpc/time.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc64/spinlock.h | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c index 3794715b2972..2a912f411eb4 100644 --- a/arch/powerpc/lib/locks.c +++ b/arch/powerpc/lib/locks.c @@ -22,7 +22,7 @@ /* waiting for a spinlock... */ #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) #include <asm/hvcall.h> -#include <asm/iSeries/HvCall.h> +#include <asm/iseries/hv_call.h> void __spin_yield(raw_spinlock_t *lock) { diff --git a/arch/powerpc/platforms/iseries/hvlog.c b/arch/powerpc/platforms/iseries/hvlog.c index f61e2e9ac9ec..5a89b481f978 100644 --- a/arch/powerpc/platforms/iseries/hvlog.c +++ b/arch/powerpc/platforms/iseries/hvlog.c @@ -9,7 +9,7 @@ #include <asm/page.h> #include <asm/abs_addr.h> -#include <asm/iSeries/HvCall.h> +#include <asm/iseries/hv_call.h> #include <asm/iSeries/HvCallSc.h> #include <asm/iSeries/HvTypes.h> diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c index f720916682f6..3336bad67724 100644 --- a/arch/powerpc/platforms/iseries/smp.c +++ b/arch/powerpc/platforms/iseries/smp.c @@ -38,7 +38,7 @@ #include <asm/io.h> #include <asm/smp.h> #include <asm/paca.h> -#include <asm/iSeries/HvCall.h> +#include <asm/iseries/hv_call.h> #include <asm/time.h> #include <asm/ppcdebug.h> #include <asm/machdep.h> diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 44f5fb4a46ef..180507ae590f 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c @@ -49,7 +49,7 @@ #include <asm/iSeries/HvLpEvent.h> #include <asm/iSeries/HvCallEvent.h> #include <asm/iSeries/HvLpConfig.h> -#include <asm/iSeries/HvCall.h> +#include <asm/iseries/hv_call.h> #ifdef CONFIG_VT #error You must turn off CONFIG_VT to use CONFIG_VIOCONS diff --git a/include/asm-ppc64/iSeries/HvCall.h b/include/asm-powerpc/iseries/hv_call.h index c3f19475c0d9..c3f19475c0d9 100644 --- a/include/asm-ppc64/iSeries/HvCall.h +++ b/include/asm-powerpc/iseries/hv_call.h diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index 410e795f7d43..d9b86a17271b 100644 --- a/include/asm-powerpc/time.h +++ b/include/asm-powerpc/time.h @@ -21,7 +21,7 @@ #include <asm/processor.h> #ifdef CONFIG_PPC64 #include <asm/paca.h> -#include <asm/iSeries/HvCall.h> +#include <asm/iseries/hv_call.h> #endif /* time.c */ diff --git a/include/asm-ppc64/spinlock.h b/include/asm-ppc64/spinlock.h index 14cb895bb607..7d84fb5e39f1 100644 --- a/include/asm-ppc64/spinlock.h +++ b/include/asm-ppc64/spinlock.h @@ -21,7 +21,7 @@ #include <linux/config.h> #include <asm/paca.h> #include <asm/hvcall.h> -#include <asm/iSeries/HvCall.h> +#include <asm/iseries/hv_call.h> #define __raw_spin_is_locked(x) ((x)->slock != 0) |