From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Oct 2008 21:38:14 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.28-rc1~72
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3d2f927f788adcdabc42f8a1616f6cc56c53bbe;p=linux-2.6-omap-h63xx.git

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.
---

e3d2f927f788adcdabc42f8a1616f6cc56c53bbe
diff --cc drivers/rtc/Kconfig
index f660ef3e5b2,30d40fe194a..814f49fde53
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -610,9 -575,17 +610,17 @@@ config RTC_DRV_RS5C31
  	help
  	  If you say yes here you get support for the Ricoh RS5C313 RTC chips.
  
+ config RTC_DRV_PARISC
+ 	tristate "PA-RISC firmware RTC support"
+ 	depends on PARISC
+ 	help
+ 	  Say Y or M here to enable RTC support on PA-RISC systems using
+ 	  firmware calls. If you do not know what you are doing, you should
+ 	  just say Y.
+ 
  config RTC_DRV_PPC
         tristate "PowerPC machine dependent RTC support"
 -       depends on PPC_MERGE
 +       depends on PPC
         help
  	 The PowerPC kernel has machine-specific functions for accessing
  	 the RTC. This exposes that functionality through the generic RTC