aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/vmlinux_32.lds.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 13:53:16 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-18 13:53:16 -0400
commit9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch)
tree0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/sh/kernel/vmlinux_32.lds.S
parentb8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/sh/kernel/vmlinux_32.lds.S')
-rw-r--r--arch/sh/kernel/vmlinux_32.lds.S1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S
index c7113786ecd4..7b4b82bd1156 100644
--- a/arch/sh/kernel/vmlinux_32.lds.S
+++ b/arch/sh/kernel/vmlinux_32.lds.S
@@ -44,7 +44,6 @@ SECTIONS
44 44
45 _etext = .; /* End of text section */ 45 _etext = .; /* End of text section */
46 46
47 BUG_TABLE
48 NOTES 47 NOTES
49 RO_DATA(PAGE_SIZE) 48 RO_DATA(PAGE_SIZE)
50 49