diff options
Diffstat (limited to 'arch/x86/kernel/rtc.c')
-rw-r--r-- | arch/x86/kernel/rtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index ca9622a25e95..cd9685235df9 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c | |||
@@ -49,11 +49,11 @@ int mach_set_rtc_mmss(const struct timespec *now) | |||
49 | retval = set_rtc_time(&tm); | 49 | retval = set_rtc_time(&tm); |
50 | if (retval) | 50 | if (retval) |
51 | printk(KERN_ERR "%s: RTC write failed with error %d\n", | 51 | printk(KERN_ERR "%s: RTC write failed with error %d\n", |
52 | __FUNCTION__, retval); | 52 | __func__, retval); |
53 | } else { | 53 | } else { |
54 | printk(KERN_ERR | 54 | printk(KERN_ERR |
55 | "%s: Invalid RTC value: write of %lx to RTC failed\n", | 55 | "%s: Invalid RTC value: write of %lx to RTC failed\n", |
56 | __FUNCTION__, nowtime); | 56 | __func__, nowtime); |
57 | retval = -EINVAL; | 57 | retval = -EINVAL; |
58 | } | 58 | } |
59 | return retval; | 59 | return retval; |
@@ -170,7 +170,7 @@ static struct platform_device rtc_device = { | |||
170 | static __init int add_rtc_cmos(void) | 170 | static __init int add_rtc_cmos(void) |
171 | { | 171 | { |
172 | #ifdef CONFIG_PNP | 172 | #ifdef CONFIG_PNP |
173 | static const char * const const ids[] __initconst = | 173 | static const char * const ids[] __initconst = |
174 | { "PNP0b00", "PNP0b01", "PNP0b02", }; | 174 | { "PNP0b00", "PNP0b01", "PNP0b02", }; |
175 | struct pnp_dev *dev; | 175 | struct pnp_dev *dev; |
176 | struct pnp_id *id; | 176 | struct pnp_id *id; |