diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 12:51:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 12:51:35 -0400 |
| commit | bad6a5c08c119572c888d5df2bd7691a4da6b9e8 (patch) | |
| tree | 7070d6c17659332caad8f3d8f38b51855b3f05c4 /arch/parisc/Kconfig | |
| parent | 03c3fa0a3bf48dcb024263a9ea41daecacbc6efa (diff) | |
| parent | 0b5f037a4dc495f9c40eed7f076fc6c23af3359b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc:
powerpc/ps3: Add rtc-ps3
powerpc: Hook up rtc-generic, and kill rtc-ppc
m68k: Hook up rtc-generic
parisc: rtc: Rename rtc-parisc to rtc-generic
parisc: rtc: Add missing module alias
parisc: rtc: platform_driver_probe() fixups
parisc: rtc: get_rtc_time() returns unsigned int
Diffstat (limited to 'arch/parisc/Kconfig')
| -rw-r--r-- | arch/parisc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index aacf11d33723..378b64944dc0 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
| @@ -10,7 +10,7 @@ config PARISC | |||
| 10 | select HAVE_IDE | 10 | select HAVE_IDE |
| 11 | select HAVE_OPROFILE | 11 | select HAVE_OPROFILE |
| 12 | select RTC_CLASS | 12 | select RTC_CLASS |
| 13 | select RTC_DRV_PARISC | 13 | select RTC_DRV_GENERIC |
| 14 | select INIT_ALL_POSSIBLE | 14 | select INIT_ALL_POSSIBLE |
| 15 | help | 15 | help |
| 16 | The PA-RISC microprocessor is designed by Hewlett-Packard and used | 16 | The PA-RISC microprocessor is designed by Hewlett-Packard and used |