Commit 6238559f authored by James Bottomley's avatar James Bottomley
Browse files

Merge tag 'disintegrate-parisc-20121016' into for-linus 



UAPI Disintegration 2012-10-16

Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parents dd8e8c4a 70c1674f

arch/parisc/include/asm/Kbuild

+4 −5
Original line number Diff line number Diff line 
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

arch/parisc/include/asm/auxvec.h

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
#ifndef __ASMPARISC_AUXVEC_H

#define __ASMPARISC_AUXVEC_H



#endif

arch/parisc/include/asm/compat_signal.h

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
/* Use generic */

#include <asm-generic/compat_signal.h>

arch/parisc/include/asm/cputime.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __PARISC_CPUTIME_H

#define __PARISC_CPUTIME_H



#include <asm-generic/cputime.h>



#endif /* __PARISC_CPUTIME_H */

arch/parisc/include/asm/device.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
/*

 * Arch specific extensions to struct device

 *

 * This file is released under the GPLv2

 */

#include <asm-generic/device.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE