summaryrefslogtreecommitdiff
path: root/arch/v850/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-07-13 22:09:23 (GMT)
committerAnton Altaparmakov <aia21@cantab.net>2005-07-13 22:09:23 (GMT)
commitc514720716c7b109ff980f8b3cb93f9af872c91c (patch)
tree490a9578995705de69712893a190b67651bddc56 /arch/v850/kernel/vmlinux.lds.S
parent07929dcb963786512c760dd3ecd148d89295e7e5 (diff)
parent1e279dd855d15b72364b4103f872d67d8592647e (diff)
downloadlinux-fsl-qoriq-c514720716c7b109ff980f8b3cb93f9af872c91c.tar.xz
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/v850/kernel/vmlinux.lds.S')
-rw-r--r--arch/v850/kernel/vmlinux.lds.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S
index bbd3429..c366a8b 100644
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -1,8 +1,8 @@
/*
* arch/v850/vmlinux.lds.S -- kernel linker script for v850 platforms
*
- * Copyright (C) 2002,03,04 NEC Electronics Corporation
- * Copyright (C) 2002,03,04 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2002,03,04,05 NEC Electronics Corporation
+ * Copyright (C) 2002,03,04,05 Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@ -61,6 +61,7 @@
*(__kcrctab_gpl) \
___stop___kcrctab_gpl = .; \
/* Built-in module parameters */ \
+ . = ALIGN (4) ; \
___start___param = .; \
*(__param) \
___stop___param = .;