* [PATCH 3/3] xtensa: Switch to asm-generic/linkage.h
@ 2013-05-07 9:57 Geert Uytterhoeven
2013-05-09 8:26 ` [merged] " Chris Zankel
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2013-05-07 9:57 UTC (permalink / raw)
To: Chris Zankel, Max Filippov; +Cc: linux-xtensa, linux-kernel, Geert Uytterhoeven
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
arch/xtensa/include/asm/Kbuild | 1 +
arch/xtensa/include/asm/linkage.h | 16 ----------------
2 files changed, 1 insertions(+), 16 deletions(-)
delete mode 100644 arch/xtensa/include/asm/linkage.h
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index 095f0a2..1b98264 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/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/arch/xtensa/include/asm/linkage.h b/arch/xtensa/include/asm/linkage.h
deleted file mode 100644
index bf2128a..0000000
--- a/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 */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [merged] Re: [PATCH 3/3] xtensa: Switch to asm-generic/linkage.h
2013-05-07 9:57 [PATCH 3/3] xtensa: Switch to asm-generic/linkage.h Geert Uytterhoeven
@ 2013-05-09 8:26 ` Chris Zankel
0 siblings, 0 replies; 2+ messages in thread
From: Chris Zankel @ 2013-05-09 8:26 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Max Filippov, linux-xtensa, linux-kernel
Should make it to Linus' tree shortly.
Thanks,
-Chris
On 05/07/2013 02:57 AM, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> arch/xtensa/include/asm/Kbuild | 1 +
> arch/xtensa/include/asm/linkage.h | 16 ----------------
> 2 files changed, 1 insertions(+), 16 deletions(-)
> delete mode 100644 arch/xtensa/include/asm/linkage.h
>
> diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
> index 095f0a2..1b98264 100644
> --- a/arch/xtensa/include/asm/Kbuild
> +++ b/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/arch/xtensa/include/asm/linkage.h b/arch/xtensa/include/asm/linkage.h
> deleted file mode 100644
> index bf2128a..0000000
> --- a/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 */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-09 8:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-07 9:57 [PATCH 3/3] xtensa: Switch to asm-generic/linkage.h Geert Uytterhoeven
2013-05-09 8:26 ` [merged] " Chris Zankel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox