[U-Boot] [PATCH 3/3] blackfin: fix linkage support due to header movement

Macpaul Lin macpaul at andestech.com
Wed Nov 30 08:23:47 CET 2011


Fix include path of linkage.h due to header file movement.

Signed-off-by: Macpaul Lin <macpaul at andestech.com>
---
 arch/blackfin/cpu/cache.S                  |    2 +-
 arch/blackfin/include/asm/blackfin_local.h |    2 +-
 arch/blackfin/include/asm/cache.h          |    2 +-
 arch/blackfin/lib/__kgdb.S                 |    2 +-
 arch/blackfin/lib/outs.S                   |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/blackfin/cpu/cache.S b/arch/blackfin/cpu/cache.S
index 6ed655a..1e468ee 100644
--- a/arch/blackfin/cpu/cache.S
+++ b/arch/blackfin/cpu/cache.S
@@ -8,9 +8,9 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <asm/linkage.h>
 #include <config.h>
 #include <asm/blackfin.h>
+#include <linux/linkage.h>
 
 .text
 /* Since all L1 caches work the same way, we use the same method for flushing
diff --git a/arch/blackfin/include/asm/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h
index 71207b6..9d27f31 100644
--- a/arch/blackfin/include/asm/blackfin_local.h
+++ b/arch/blackfin/include/asm/blackfin_local.h
@@ -48,8 +48,8 @@
 #define L1_CACHE_SHIFT 5
 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
 
-#include <asm/linkage.h>
 #include <asm/cache.h>
+#include <linux/linkage.h>
 
 #ifndef __ASSEMBLY__
 # ifdef SHARED_RESOURCES
diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
index 482e4b5..568885a 100644
--- a/arch/blackfin/include/asm/cache.h
+++ b/arch/blackfin/include/asm/cache.h
@@ -7,7 +7,7 @@
 #ifndef __ARCH_BLACKFIN_CACHE_H
 #define __ARCH_BLACKFIN_CACHE_H
 
-#include <asm/linkage.h>	/* for asmlinkage */
+#include <linux/linkage.h>	/* for asmlinkage */
 
 /*
  * Bytes per L1 cache line
diff --git a/arch/blackfin/lib/__kgdb.S b/arch/blackfin/lib/__kgdb.S
index cba4179..4ccde8f 100644
--- a/arch/blackfin/lib/__kgdb.S
+++ b/arch/blackfin/lib/__kgdb.S
@@ -1,5 +1,5 @@
 
-#include <asm/linkage.h>
+#include <linux/linkage.h>
 
 /* save stack context for non-local goto
  * int kgdb_setjmp(long *buf)
diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S
index 253d4c3..39d5332 100644
--- a/arch/blackfin/lib/outs.S
+++ b/arch/blackfin/lib/outs.S
@@ -8,7 +8,7 @@
  * Licensed under the GPL-2.
  */
 
-#include <asm/linkage.h>
+#include <linux/linkage.h>
 
 .align 2
 
-- 
1.7.3.5



More information about the U-Boot mailing list