diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 17:59:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 17:59:11 -0400 |
| commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
| tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/kernel/head.S | |
| parent | 4744b43431e8613f920c5cba88346756f53c5165 (diff) | |
| parent | 7f30491ccd28627742e37899453ae20e3da8e18f (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/kernel/head.S')
| -rw-r--r-- | arch/ia64/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S index db540e58c783..41c712917ff7 100644 --- a/arch/ia64/kernel/head.S +++ b/arch/ia64/kernel/head.S | |||
| @@ -1123,7 +1123,7 @@ SET_REG(b5); | |||
| 1123 | * p15 - used to track flag status. | 1123 | * p15 - used to track flag status. |
| 1124 | * | 1124 | * |
| 1125 | * If you patch this code to use more registers, do not forget to update | 1125 | * If you patch this code to use more registers, do not forget to update |
| 1126 | * the clobber lists for spin_lock() in include/asm-ia64/spinlock.h. | 1126 | * the clobber lists for spin_lock() in arch/ia64/include/asm/spinlock.h. |
| 1127 | */ | 1127 | */ |
| 1128 | 1128 | ||
| 1129 | #if (__GNUC__ == 3 && __GNUC_MINOR__ < 3) | 1129 | #if (__GNUC__ == 3 && __GNUC_MINOR__ < 3) |