diff options
author | Kelly Daly <kelly@au.ibm.com> | 2005-11-01 00:59:20 -0500 |
---|---|---|
committer | Kelly Daly <kelly@au.ibm.com> | 2005-11-01 00:59:20 -0500 |
commit | 1da44037883c0405154d53fe76da27e078456664 (patch) | |
tree | db6f579831b89c55e0e0c095345b4d1e5bdd0500 /include | |
parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) |
merge filename and modify references to iseries/hv_call.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
Diffstat (limited to 'include')
-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 |
3 files changed, 2 insertions, 2 deletions
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 @@ | |||
21 | #include <asm/processor.h> | 21 | #include <asm/processor.h> |
22 | #ifdef CONFIG_PPC64 | 22 | #ifdef CONFIG_PPC64 |
23 | #include <asm/paca.h> | 23 | #include <asm/paca.h> |
24 | #include <asm/iSeries/HvCall.h> | 24 | #include <asm/iseries/hv_call.h> |
25 | #endif | 25 | #endif |
26 | 26 | ||
27 | /* time.c */ | 27 | /* 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 @@ | |||
21 | #include <linux/config.h> | 21 | #include <linux/config.h> |
22 | #include <asm/paca.h> | 22 | #include <asm/paca.h> |
23 | #include <asm/hvcall.h> | 23 | #include <asm/hvcall.h> |
24 | #include <asm/iSeries/HvCall.h> | 24 | #include <asm/iseries/hv_call.h> |
25 | 25 | ||
26 | #define __raw_spin_is_locked(x) ((x)->slock != 0) | 26 | #define __raw_spin_is_locked(x) ((x)->slock != 0) |
27 | 27 | ||