diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2015-01-29 11:35:19 +0900 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-02 11:46:31 +0100 |
| commit | a1b347f24cf61036878111bc31cfdffbad393661 (patch) | |
| tree | 0789a57507f0fb9d9ec51401bd9672078682c696 /arch/blackfin/lib | |
| parent | 7f7cdb3466d216558fdff3789e27baac6ad3b53c (diff) | |
| download | barebox-a1b347f24cf61036878111bc31cfdffbad393661.tar.gz barebox-a1b347f24cf61036878111bc31cfdffbad393661.tar.xz | |
blackfin: consolidate arch/blackfin/include/asm/linkage.h
Since include/linux/linkage.h includes <asm/linkage.h>, the basic
coding style we should follow is:
- <linux/linkage.h> should contain default macro defines
- <asm/linkage.h> can define arch-specific macros and override the
default ones in <linux/linkage.h>
The arch/blackfin/include/asm/linkage.h has redundant defines that
are already defined in <linux/linkage.h>.
Replace it with the one imported from Linux 3.19-rc6.
Generally, <asm/linkage.h> should not be included directly.
Fix two files to include <linux/linkage.h> instead.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/blackfin/lib')
| -rw-r--r-- | arch/blackfin/lib/flush.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/lib/flush.S b/arch/blackfin/lib/flush.S index 62aa496986..4ee5d870ac 100644 --- a/arch/blackfin/lib/flush.S +++ b/arch/blackfin/lib/flush.S @@ -8,7 +8,7 @@ */ #define ASSEMBLY -#include <asm/linkage.h> +#include <linux/linkage.h> #include <asm/cplb.h> #include <asm/blackfin.h> |