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

Commit e3d2f927 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: convert to generic compat_sys_ptrace
  parisc: add rtc platform driver
  parisc: initialize unwinder much earlier
  parisc: add new syscalls
  parisc: hijack jump to start_kernel
  parisc: add pdc_coproc_cfg_unlocked and set_firmware_width_unlocked
  parisc: move include/asm-parisc to arch/parisc/include/asm
  parisc: move pdc_result to real2.S
  parisc: unify CCIO_COLLECT_STATS implementation
  parisc: add arch/parisc/kernel/.gitignore
  parisc: ropes.h - fix <asm-parisc/*> -> <asm/*>
  parisc: parisc-agp - fix <asm-parisc/*> -> <asm/*>

Resolve remove/rename conflict: include/asm-parisc/a.out.h is no longer
relevant.
parents a9b6148d 81e192d6

arch/parisc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ config PARISC 
	def_bool y

	select HAVE_IDE

	select HAVE_OPROFILE

	select RTC_CLASS

	select RTC_DRV_PARISC

	help

	  The PA-RISC microprocessor is designed by Hewlett-Packard and used

	  in many of their workstations & servers (HP9000 700 and 800 series,

include/asm-parisc/Kbuild→arch/parisc/include/asm/Kbuild

+0 −0

File moved.

View file

include/asm-parisc/agp.h→arch/parisc/include/asm/agp.h

+0 −0

File moved.

View file