* [PATCH -mmotm] drivers/char/rtc.c: fix build failure
@ 2008-06-05 1:20 Li Zefan
0 siblings, 0 replies; only message in thread
From: Li Zefan @ 2008-06-05 1:20 UTC (permalink / raw)
To: Andrew Morton; +Cc: LKML, alan
This patch caused build failure:
rtc-push-the-bkl-down-into-the-driver-ioctl-method.patch
drivers/char/rtc.c:721: error: conflicting types for ‘rtc_ioctl’
drivers/char/rtc.c:146: error: previous declaration of ‘rtc_ioctl’ was here
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
rtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/char/rtc.c.old 2008-06-05 09:11:20.000000000 +0800
+++ a/drivers/char/rtc.c 2008-06-05 09:11:28.000000000 +0800
@@ -143,7 +143,7 @@ static DEFINE_TIMER(rtc_irq_timer, rtc_d
static ssize_t rtc_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos);
-static int rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
+static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
static void rtc_get_rtc_time(struct rtc_time *rtc_tm);
#ifdef RTC_IRQ
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-05 1:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-05 1:20 [PATCH -mmotm] drivers/char/rtc.c: fix build failure Li Zefan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox