diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-07 04:08:34 -0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-06-16 07:47:39 -0400 |
| commit | decd48ccbe6d5a883f400b7b9b797ab7fe228c0d (patch) | |
| tree | b920298de651864545fa7079f12f317e3ffe8479 | |
| parent | 0dad16fd4e61b2d3a22ef0ea15ba8369bacf090a (diff) | |
cris: Switch to asm-generic/linkage.h
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
| -rw-r--r-- | arch/cris/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/cris/include/asm/linkage.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 74784882e220..1e7dfadb8371 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild | |||
| @@ -6,5 +6,6 @@ header-y += arch-v32/ | |||
| 6 | generic-y += clkdev.h | 6 | generic-y += clkdev.h |
| 7 | generic-y += exec.h | 7 | generic-y += exec.h |
| 8 | generic-y += kvm_para.h | 8 | generic-y += kvm_para.h |
| 9 | generic-y += linkage.h | ||
| 9 | generic-y += module.h | 10 | generic-y += module.h |
| 10 | generic-y += trace_clock.h | 11 | generic-y += trace_clock.h |
diff --git a/arch/cris/include/asm/linkage.h b/arch/cris/include/asm/linkage.h deleted file mode 100644 index 291c2d01c44f..000000000000 --- a/arch/cris/include/asm/linkage.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __ASM_LINKAGE_H | ||
| 2 | #define __ASM_LINKAGE_H | ||
| 3 | |||
| 4 | /* Nothing to see here... */ | ||
| 5 | |||
| 6 | #endif | ||