summaryrefslogtreecommitdiff
path: root/arch/mips/ite-boards/generic/time.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-29 06:24:50 +0400
committerPaul Mackerras <paulus@samba.org>2006-03-29 06:24:50 +0400
commitbac30d1a78d0f11c613968fc8b351a91ed465386 (patch)
treee52f3c876522a2f6047a6ec1c27df2e8a79486b8 /arch/mips/ite-boards/generic/time.c
parente8222502ee6157e2713da9e0792c21f4ad458d50 (diff)
parentca9ba4471c1203bb6e759b76e83167fec54fe590 (diff)
downloadlinux-bac30d1a78d0f11c613968fc8b351a91ed465386.tar.xz
Merge ../linux-2.6
Diffstat (limited to 'arch/mips/ite-boards/generic/time.c')
-rw-r--r--arch/mips/ite-boards/generic/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/ite-boards/generic/time.c b/arch/mips/ite-boards/generic/time.c
index f5d67ee21ac6..b79817bb6cce 100644
--- a/arch/mips/ite-boards/generic/time.c
+++ b/arch/mips/ite-boards/generic/time.c
@@ -227,8 +227,8 @@ void __init it8172_time_init(void)
local_irq_restore(flags);
- rtc_get_time = it8172_rtc_get_time;
- rtc_set_time = it8172_rtc_set_time;
+ rtc_mips_get_time = it8172_rtc_get_time;
+ rtc_mips_set_time = it8172_rtc_set_time;
}
#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)