Merge 3.14-rc4 into char-misc-linus

[~andy/linux] / arch / sh / include / asm / traps.h

diff --git a/arch/sh/include/asm/traps.h b/arch/sh/include/asm/traps.h
index afd9df8d064110c52b39fbcc177ffc02018c42a4..9cc149a0dbd1f35723c9e13b98c15fb939674435 100644 (file)
--- a/arch/sh/include/asm/traps.h
+++ b/arch/sh/include/asm/traps.h
@@ -4,9 +4,9 @@
 #include <linux/compiler.h>
 
 #ifdef CONFIG_SUPERH32
-# include "traps_32.h"
+# include <asm/traps_32.h>
 #else
-# include "traps_64.h"
+# include <asm/traps_64.h>
 #endif
 
 BUILD_TRAP_HANDLER(address_error);