Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Move include/asm-ia64 to arch/ia64/include/asm
This commit is contained in:
Linus Torvalds
Коммит
2b12a4c524
|
|
@ -1,6 +1,4 @@
|
|||
/*
|
||||
* asm-ia64/acpi.h
|
||||
*
|
||||
* Copyright (C) 1999 VA Linux Systems
|
||||
* Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
|
||||
* Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com>
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
/*
|
||||
* include/asm-ia64/cputime.h:
|
||||
* Definitions for measuring cputime on ia64 machines.
|
||||
* Definitions for measuring cputime on ia64 machines.
|
||||
*
|
||||
* Based on <asm-powerpc/cputime.h>.
|
||||
*
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
#ifndef _IA64_KDEBUG_H
|
||||
#define _IA64_KDEBUG_H 1
|
||||
/*
|
||||
* include/asm-ia64/kdebug.h
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
#define _ASM_KPROBES_H
|
||||
/*
|
||||
* Kernel Probes (KProbes)
|
||||
* include/asm-ia64/kprobes.h
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
#define __ASM_IA64_KVM_H
|
||||
|
||||
/*
|
||||
* asm-ia64/kvm.h: kvm structure definitions for ia64
|
||||
* kvm structure definitions for ia64
|
||||
*
|
||||
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
|
||||
*
|
||||
|
|
@ -2,8 +2,6 @@
|
|||
#define __IA64_KVM_PARA_H
|
||||
|
||||
/*
|
||||
* asm-ia64/kvm_para.h
|
||||
*
|
||||
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
|
|
@ -290,7 +290,7 @@ extern void machvec_init (const char *name);
|
|||
extern void machvec_init_from_cmdline(const char *cmdline);
|
||||
|
||||
# else
|
||||
# error Unknown configuration. Update asm-ia64/machvec.h.
|
||||
# error Unknown configuration. Update arch/ia64/include/asm/machvec.h.
|
||||
# endif /* CONFIG_IA64_GENERIC */
|
||||
|
||||
/*
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/******************************************************************************
|
||||
* include/asm-ia64/native/inst.h
|
||||
* arch/ia64/include/asm/native/inst.h
|
||||
*
|
||||
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
|
||||
* VA Linux Systems Japan K.K.
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/******************************************************************************
|
||||
* include/asm-ia64/native/irq.h
|
||||
* arch/ia64/include/asm/native/irq.h
|
||||
*
|
||||
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
|
||||
* VA Linux Systems Japan K.K.
|
||||
|
|
@ -17,8 +17,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* moved from linux/include/asm-ia64/irq.h.
|
||||
*/
|
||||
|
||||
#ifndef _ASM_IA64_NATIVE_IRQ_H
|
||||
|
|
@ -1,6 +1,4 @@
|
|||
/******************************************************************************
|
||||
* include/asm-ia64/paravirt.h
|
||||
*
|
||||
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
|
||||
* VA Linux Systems Japan K.K.
|
||||
*
|
||||
|
|
@ -1,6 +1,4 @@
|
|||
/******************************************************************************
|
||||
* include/asm-ia64/paravirt_privops.h
|
||||
*
|
||||
* Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
|
||||
* VA Linux Systems Japan K.K.
|
||||
*
|
||||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче