diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 14:38:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 14:40:31 -0700 |
commit | e3d2f927f788adcdabc42f8a1616f6cc56c53bbe (patch) | |
tree | ff051e33cff49e23f4c4ef84360f22cf7a1998c9 /drivers/rtc/Kconfig | |
parent | a9b6148d25f15ddfe9d7a7f3e526fdb64e7cf7da (diff) | |
parent | 81e192d6ce303b6792aa38ff35f41a1a7357f23a (diff) | |
download | op-kernel-dev-e3d2f927f788adcdabc42f8a1616f6cc56c53bbe.zip op-kernel-dev-e3d2f927f788adcdabc42f8a1616f6cc56c53bbe.tar.gz |
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.
Diffstat (limited to 'drivers/rtc/Kconfig')
-rw-r--r-- | drivers/rtc/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index f660ef3..814f49f 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -610,6 +610,14 @@ config RTC_DRV_RS5C313 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 |