diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 03:25:53 -0500 |
| commit | 9c3c8afccb6a163fd2be739f511e863eab668702 (patch) | |
| tree | e587a5377ada98fed8cfa6c8ee63125361f2818a /arch/cris | |
| parent | 290293eda2c6dd368476d71433bdef07c39a6829 (diff) | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
Merge commit 'v2.6.38-rc8' into spi/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/kernel/vmlinux.lds.S | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S index 442218980db0..c49be845f96a 100644 --- a/arch/cris/kernel/vmlinux.lds.S +++ b/arch/cris/kernel/vmlinux.lds.S | |||
| @@ -72,11 +72,6 @@ SECTIONS | |||
| 72 | INIT_TEXT_SECTION(PAGE_SIZE) | 72 | INIT_TEXT_SECTION(PAGE_SIZE) |
| 73 | .init.data : { INIT_DATA } | 73 | .init.data : { INIT_DATA } |
| 74 | .init.setup : { INIT_SETUP(16) } | 74 | .init.setup : { INIT_SETUP(16) } |
| 75 | #ifdef CONFIG_ETRAX_ARCH_V32 | ||
| 76 | __start___param = .; | ||
| 77 | __param : { *(__param) } | ||
| 78 | __stop___param = .; | ||
| 79 | #endif | ||
| 80 | .initcall.init : { | 75 | .initcall.init : { |
| 81 | INIT_CALLS | 76 | INIT_CALLS |
| 82 | } | 77 | } |