From 2624be76ee3165a9a24df8095b8bedfd6f15ef6e Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 7 May 2013 11:57:33 +0200 Subject: [PATCH] --- yaml --- r: 374989 b: refs/heads/master c: b341d84c8ac5ecbf7aa0b3ccd0745d87e881953c h: refs/heads/master i: 374987: 7144aaf63e7ff18810a07473f09f9a1b2fadeac7 v: v3 --- [refs] | 2 +- trunk/arch/xtensa/include/asm/Kbuild | 1 + trunk/arch/xtensa/include/asm/linkage.h | 16 ---------------- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 trunk/arch/xtensa/include/asm/linkage.h diff --git a/[refs] b/[refs] index 914db3764425..f49c0403b456 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a078ccff5642a8fe792a43b3d973bcc3f6dd733f +refs/heads/master: b341d84c8ac5ecbf7aa0b3ccd0745d87e881953c diff --git a/trunk/arch/xtensa/include/asm/Kbuild b/trunk/arch/xtensa/include/asm/Kbuild index 095f0a2244f7..1b982641ec35 100644 --- a/trunk/arch/xtensa/include/asm/Kbuild +++ b/trunk/arch/xtensa/include/asm/Kbuild @@ -15,6 +15,7 @@ generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h generic-y += kvm_para.h +generic-y += linkage.h generic-y += local.h generic-y += local64.h generic-y += percpu.h diff --git a/trunk/arch/xtensa/include/asm/linkage.h b/trunk/arch/xtensa/include/asm/linkage.h deleted file mode 100644 index bf2128a99d79..000000000000 --- a/trunk/arch/xtensa/include/asm/linkage.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * include/asm-xtensa/linkage.h - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2001 - 2005 Tensilica Inc. - */ - -#ifndef _XTENSA_LINKAGE_H -#define _XTENSA_LINKAGE_H - -/* Nothing to do here ... */ - -#endif /* _XTENSA_LINKAGE_H */