Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22054fbe authored Oct 19, 2012 by Linus Torvalds

Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6



Pull PARISC changes from James Bottomley:
 "This is a couple of high code motion patches (all within arch/parisc)
  I'd like to apply at -rc1 to avoid conflicts with anything else.  One
  moves us on to the generated instead of included asm file model and
  the other is a pull request from David Howells for UAPI
  disintegration.

  Signed-off-by: James Bottomley <JBottomley@Parallels.com&gt;">

* tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  UAPI: (Scripted) Disintegrate arch/parisc/include/asm
  [PARISC] asm: redo generic includes

parents ea26d0cf 6238559f

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>