diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 11:02:42 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 11:02:42 -0400 |
commit | 1e72fe1fca4490474984d6356bbf66e2daa89f73 (patch) | |
tree | 12d95820cbb2083a6c78cfe550a0f9b20b1246eb /arch/m68k/kernel/vmlinux-nommu.lds | |
parent | 8a211d362cc94df2bb42323ab13d258650529bec (diff) | |
parent | a46d2619d7180bda12bad2bf15bbd0731dfc2dcf (diff) |
Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
* 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: imx51-babbage: fix esdhc cd/wp properties
ARM: imx6: spin the cpu until hardware takes it down
ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path
Also updates to Linux 3.6-rc2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/m68k/kernel/vmlinux-nommu.lds')
-rw-r--r-- | arch/m68k/kernel/vmlinux-nommu.lds | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds index 40e02d9c38b4..06a763f49fd3 100644 --- a/arch/m68k/kernel/vmlinux-nommu.lds +++ b/arch/m68k/kernel/vmlinux-nommu.lds | |||
@@ -78,9 +78,7 @@ SECTIONS { | |||
78 | __init_end = .; | 78 | __init_end = .; |
79 | } | 79 | } |
80 | 80 | ||
81 | _sbss = .; | ||
82 | BSS_SECTION(0, 0, 0) | 81 | BSS_SECTION(0, 0, 0) |
83 | _ebss = .; | ||
84 | 82 | ||
85 | _end = .; | 83 | _end = .; |
86 | 84 | ||