Hi all, After merging the final tree, today's linux-next build (i386 defconfig) failed like this: drivers/rtc/class.c: In function 'rtc_init': drivers/rtc/class.c:261:23: error: 'rtc_suspend' undeclared (first use in this function) drivers/rtc/class.c:261:23: note: each undeclared identifier is reported only once for each function it appears in drivers/rtc/class.c:262:22: error: 'rtc_resume' undeclared (first use in this function) Caused by commit "rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix" from the akpm tree. I have added the following patch for today: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Mon, 17 Sep 2012 21:43:56 +1000 Subject: [PATCH] rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix-2 Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- drivers/rtc/class.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index ca58ea9..f8a0aab 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c @@ -34,8 +34,9 @@ static void rtc_device_release(struct device *dev) #ifdef CONFIG_RTC_HCTOSYS_DEVICE /* Result of the last RTC to system clock attempt. */ int rtc_hctosys_ret = -ENODEV; +#endif -#ifdef CONFIG_PM +#if defined(CONFIG_PM) && defined(CONFIG_RTC_HCTOSYS_DEVICE) /* * On suspend(), measure the delta between one RTC and the * system's wall clock; restore it on resume(). @@ -129,7 +130,6 @@ static int rtc_resume(struct device *dev) #define rtc_suspend NULL #define rtc_resume NULL #endif -#endif /** -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpO8sR25G70d.pgp
Description: PGP signature
