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/setup.c | |
| 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/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index e5c2de9b29a5..593279f33e96 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -314,7 +314,7 @@ static inline void __init setup_crashkernel(unsigned long total, int *n) | |||
| 314 | * | 314 | * |
| 315 | * Setup the reserved memory areas set aside for the boot parameters, | 315 | * Setup the reserved memory areas set aside for the boot parameters, |
| 316 | * initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined, | 316 | * initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined, |
| 317 | * see include/asm-ia64/meminit.h if you need to define more. | 317 | * see arch/ia64/include/asm/meminit.h if you need to define more. |
| 318 | */ | 318 | */ |
| 319 | void __init | 319 | void __init |
| 320 | reserve_memory (void) | 320 | reserve_memory (void) |