diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 16:54:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 16:54:43 -0400 |
| commit | 72e19b3b22f43b20ee84db0deba33c71803cbe34 (patch) | |
| tree | 2ca2ad35d0f01b0a808991ca3749060f8c382b24 /arch | |
| parent | f42ac38c59e0a03d6da0c24a63fb211393f484b0 (diff) | |
| parent | dbe13d9981e55c60a030d0509acc9a8968b9c5bf (diff) | |
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 | |||
| 55 | __start___ex_table = .; | 55 | __start___ex_table = .; |
| 56 | *(__ex_table) | 56 | *(__ex_table) |
| 57 | __stop___ex_table = .; | 57 | __stop___ex_table = .; |
| 58 | } | 58 | } :data |
| 59 | 59 | ||
| 60 | .data : { /* Data */ | 60 | .data : { /* Data */ |
| 61 | DATA_DATA | 61 | DATA_DATA |