diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-20 19:49:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-20 19:49:45 -0400 |
| commit | aea1f7964ae6cba5eb419a958956deb9016b3341 (patch) | |
| tree | e326d376529ea0be73ab435317709b684bb3f7cf /arch | |
| parent | 457f82bac659745f6d5052e4c493d92d62722c9c (diff) | |
| parent | 04e448d9a386640a79a4aa71251aa1cdd314f662 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
vmlinux.lds.h: restructure BSS linker script macros
kconfig: initialize the screen before using curses(3) functions
kconfig: variable argument lists needs `stdarg.h'
kbuild, deb-pkg: fix install scripts for posix sh
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mn10300/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index c96ba3da95ac..f4aa07934654 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
| @@ -107,7 +107,7 @@ SECTIONS | |||
| 107 | __init_end = .; | 107 | __init_end = .; |
| 108 | /* freed after init ends here */ | 108 | /* freed after init ends here */ |
| 109 | 109 | ||
| 110 | BSS(4) | 110 | BSS_SECTION(0, PAGE_SIZE, 4) |
| 111 | 111 | ||
| 112 | _end = . ; | 112 | _end = . ; |
| 113 | 113 | ||