diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/arm/kernel/vmlinux.lds.S | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 4957e13ef55b..b16c07914b55 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -43,10 +43,6 @@ SECTIONS | |||
| 43 | 43 | ||
| 44 | INIT_SETUP(16) | 44 | INIT_SETUP(16) |
| 45 | 45 | ||
| 46 | __early_begin = .; | ||
| 47 | *(.early_param.init) | ||
| 48 | __early_end = .; | ||
| 49 | |||
| 50 | INIT_CALLS | 46 | INIT_CALLS |
| 51 | CON_INITCALL | 47 | CON_INITCALL |
| 52 | SECURITY_INITCALL | 48 | SECURITY_INITCALL |