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/powerpc/include/asm/ps3.h | |
| 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/powerpc/include/asm/ps3.h')
| -rw-r--r-- | arch/powerpc/include/asm/ps3.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h index 67f1812698d2..cdb6fd814de8 100644 --- a/arch/powerpc/include/asm/ps3.h +++ b/arch/powerpc/include/asm/ps3.h | |||
| @@ -50,6 +50,9 @@ enum ps3_param_av_multi_out { | |||
| 50 | 50 | ||
| 51 | enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void); | 51 | enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void); |
| 52 | 52 | ||
| 53 | extern u64 ps3_os_area_get_rtc_diff(void); | ||
| 54 | extern void ps3_os_area_set_rtc_diff(u64 rtc_diff); | ||
| 55 | |||
| 53 | /* dma routines */ | 56 | /* dma routines */ |
| 54 | 57 | ||
| 55 | enum ps3_dma_page_size { | 58 | enum ps3_dma_page_size { |