diff options
| author | Jaroslav Kysela <perex@tm8103> | 2005-11-07 05:02:51 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@tm8103> | 2005-11-07 05:02:51 -0500 |
| commit | 1d4ae4a119e5ba711f12b05cdf27f794460add4b (patch) | |
| tree | 13a196ce55115d8f64acf0db86314f5abc847b40 /include/asm-ppc64/spinlock.h | |
| parent | c2f2f0fa3829a8da1e029346c4f7e8da82f95d62 (diff) | |
| parent | 0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc64/spinlock.h')
| -rw-r--r-- | include/asm-ppc64/spinlock.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||