diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 20:12:23 -0500 |
commit | 9f5a405b6843933c1cae5826046a5dd6357f142a (patch) | |
tree | bcdbb0175d37b780551b71c40abcde964a8905eb /arch/mips/mm/cex-sb1.S | |
parent | b7cffb028abbffff3ba0b87268ecb775ed354049 (diff) | |
parent | 051d3cbd96909b2fe6b5038e7bbe77f41356db05 (diff) | |
download | kernel_samsung_smdk4412-9f5a405b6843933c1cae5826046a5dd6357f142a.zip kernel_samsung_smdk4412-9f5a405b6843933c1cae5826046a5dd6357f142a.tar.gz kernel_samsung_smdk4412-9f5a405b6843933c1cae5826046a5dd6357f142a.tar.bz2 |
Merge branch 'from-linus'
Diffstat (limited to 'arch/mips/mm/cex-sb1.S')
-rw-r--r-- | arch/mips/mm/cex-sb1.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/cex-sb1.S b/arch/mips/mm/cex-sb1.S index 0e71580..e54a62f 100644 --- a/arch/mips/mm/cex-sb1.S +++ b/arch/mips/mm/cex-sb1.S @@ -64,7 +64,7 @@ LEAF(except_vec2_sb1) sd k0,0x170($0) sd k1,0x178($0) -#if CONFIG_SB1_CEX_ALWAYS_FATAL +#ifdef CONFIG_SB1_CEX_ALWAYS_FATAL j handle_vec2_sb1 nop #else |