diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 10:12:55 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 10:12:55 +0100 |
commit | f3831a592fe4332a70baad64a860b345398885b7 (patch) | |
tree | fd27b986295fe5a4f1c0924a804228f829a4c894 /arch/frv/kernel/head-uc-fr555.S | |
parent | 376f7839b72ec526173cafb5d8eadfc61e2effdf (diff) | |
parent | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (diff) | |
download | kernel-crypto-f3831a592fe4332a70baad64a860b345398885b7.tar.gz kernel-crypto-f3831a592fe4332a70baad64a860b345398885b7.tar.xz kernel-crypto-f3831a592fe4332a70baad64a860b345398885b7.zip |
Merge commit 'takashi/topic/asoc' into for-2.6.31
Diffstat (limited to 'arch/frv/kernel/head-uc-fr555.S')
-rw-r--r-- | arch/frv/kernel/head-uc-fr555.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/frv/kernel/head-uc-fr555.S b/arch/frv/kernel/head-uc-fr555.S index 39937c19b46..5497aaf34f7 100644 --- a/arch/frv/kernel/head-uc-fr555.S +++ b/arch/frv/kernel/head-uc-fr555.S @@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h> @@ -29,7 +30,7 @@ #define __551_LCR 0xfeff1100 #define __551_LSBR 0xfeff1c00 - .section .text.init,"ax" + __INIT .balign 4 ############################################################################### |