Messages in this thread | | | Date | Thu, 09 May 2013 01:26:17 -0700 | From | Chris Zankel <> | Subject | [merged] Re: [PATCH 3/3] xtensa: Switch to asm-generic/linkage.h |
| |
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 */
| |