diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 22:54:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 22:54:43 +0200 |
| commit | 72e19b3b22f43b20ee84db0deba33c71803cbe34 (patch) | |
| tree | 2ca2ad35d0f01b0a808991ca3749060f8c382b24 /arch | |
| parent | ftrace: disable tracing for suspend to ram (diff) | |
| parent | [S390] dcss: fix build bug. (diff) | |
| download | linux-72e19b3b22f43b20ee84db0deba33c71803cbe34.tar.xz linux-72e19b3b22f43b20ee84db0deba33c71803cbe34.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] dcss: fix build bug.
[S390] Fix linker script.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 76c1e60c92f3..607bd67a18ce 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -55,7 +55,7 @@ SECTIONS __start___ex_table = .; *(__ex_table) __stop___ex_table = .; - } + } :data .data : { /* Data */ DATA_DATA |