diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-07 11:55:55 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-06-19 02:08:20 -0700 |
| commit | ccd847b2c101a7e5772d0463ac76f7c18732675a (patch) | |
| tree | e0d767c6bc102fc60f56199e1142e903f848670a /arch | |
| parent | Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (diff) | |
| download | linux-dev-ccd847b2c101a7e5772d0463ac76f7c18732675a.tar.xz linux-dev-ccd847b2c101a7e5772d0463ac76f7c18732675a.zip | |
sparc: Switch to asm-generic/linkage.h
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | arch/sparc/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/sparc/include/asm/linkage.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index ff18e3cfb6b1..7e4a97fbded4 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild @@ -6,6 +6,7 @@ generic-y += cputime.h generic-y += div64.h generic-y += emergency-restart.h generic-y += exec.h +generic-y += linkage.h generic-y += local64.h generic-y += mutex.h generic-y += irq_regs.h diff --git a/arch/sparc/include/asm/linkage.h b/arch/sparc/include/asm/linkage.h deleted file mode 100644 index 291c2d01c44f..000000000000 --- a/arch/sparc/include/asm/linkage.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_LINKAGE_H -#define __ASM_LINKAGE_H - -/* Nothing to see here... */ - -#endif |