diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
| commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
| tree | 21264cc26fa0322d668b398808f10bd93558d25f /arch/ppc | |
| parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
| parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/machine_kexec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c index 84d65a87191e..a469ba438cbe 100644 --- a/arch/ppc/kernel/machine_kexec.c +++ b/arch/ppc/kernel/machine_kexec.c | |||
| @@ -25,8 +25,8 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)( | |||
| 25 | unsigned long reboot_code_buffer, | 25 | unsigned long reboot_code_buffer, |
| 26 | unsigned long start_address) ATTRIB_NORET; | 26 | unsigned long start_address) ATTRIB_NORET; |
| 27 | 27 | ||
| 28 | const extern unsigned char relocate_new_kernel[]; | 28 | extern const unsigned char relocate_new_kernel[]; |
| 29 | const extern unsigned int relocate_new_kernel_size; | 29 | extern const unsigned int relocate_new_kernel_size; |
| 30 | 30 | ||
| 31 | void machine_shutdown(void) | 31 | void machine_shutdown(void) |
| 32 | { | 32 | { |