Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git/

This commit is contained in:
David Howells 2012-10-16 21:28:01 +01:00
commit e1141355e0
23 changed files with 4 additions and 89 deletions

View File

@ -1,6 +1,7 @@
include include/asm-generic/Kbuild.asm
header-y += pdc.h
generic-y += clkdev.h
generic-y += word-at-a-time.h
generic-y += exec.h
generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \
segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \
div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \
poll.h xor.h clkdev.h exec.h

View File

@ -1,4 +0,0 @@
#ifndef __ASMPARISC_AUXVEC_H
#define __ASMPARISC_AUXVEC_H
#endif

View File

@ -1,2 +0,0 @@
/* Use generic */
#include <asm-generic/compat_signal.h>

View File

@ -1,6 +0,0 @@
#ifndef __PARISC_CPUTIME_H
#define __PARISC_CPUTIME_H
#include <asm-generic/cputime.h>
#endif /* __PARISC_CPUTIME_H */

View File

@ -1,7 +0,0 @@
/*
* Arch specific extensions to struct device
*
* This file is released under the GPLv2
*/
#include <asm-generic/device.h>

View File

@ -1 +0,0 @@
#include <asm-generic/div64.h>

View File

@ -1,6 +0,0 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H
#include <asm-generic/emergency-restart.h>
#endif /* _ASM_EMERGENCY_RESTART_H */

View File

@ -1,8 +0,0 @@
#ifndef _ASM_HW_IRQ_H
#define _ASM_HW_IRQ_H
/*
* linux/include/asm/hw_irq.h
*/
#endif

View File

@ -1 +0,0 @@
#include <asm-generic/irq_regs.h>

View File

@ -1 +0,0 @@
#include <asm-generic/kdebug.h>

View File

@ -1 +0,0 @@
#include <asm-generic/kvm_para.h>

View File

@ -1 +0,0 @@
#include <asm-generic/local.h>

View File

@ -1 +0,0 @@
#include <asm-generic/local64.h>

View File

@ -1,9 +0,0 @@
/*
* Pull in the generic implementation for the mutex fastpath.
*
* TODO: implement optimized primitives instead, or leave the generic
* implementation in place, or pick the atomic_xchg() based generic
* implementation. (see asm-generic/mutex-xchg.h for details)
*/
#include <asm-generic/mutex-dec.h>

View File

@ -1 +0,0 @@
#include <asm-generic/param.h>

View File

@ -1,7 +0,0 @@
#ifndef _PARISC_PERCPU_H
#define _PARISC_PERCPU_H
#include <asm-generic/percpu.h>
#endif

View File

@ -1 +0,0 @@
#include <asm-generic/poll.h>

View File

@ -1,5 +0,0 @@
#ifndef _PARISC_REAL_H
#define _PARISC_REAL_H
#endif

View File

@ -1,6 +0,0 @@
#ifndef __PARISC_SEGMENT_H
#define __PARISC_SEGMENT_H
/* Only here because we have some old header files that expect it.. */
#endif

View File

@ -1,6 +0,0 @@
#ifndef _ASM_PARISC_TOPOLOGY_H
#define _ASM_PARISC_TOPOLOGY_H
#include <asm-generic/topology.h>
#endif /* _ASM_PARISC_TOPOLOGY_H */

View File

@ -1,5 +0,0 @@
/* This file should not exist, but lots of generic code still includes
it. It's a hangover from old a.out days and the traditional core
dump format. We are ELF-only, and so are our core dumps. If we
need to support HP/UX core format then we'll do it here
eventually. */

View File

@ -1,6 +0,0 @@
#ifndef __ASM_PARISC_VGA_H__
#define __ASM_PARISC_VGA_H__
/* nothing */
#endif /* __ASM_PARISC_VGA_H__ */

View File

@ -1 +0,0 @@
#include <asm-generic/xor.h>