drivers/char/rtc.c: fix build failure

PATCH New Li Zefan 1 participant 1 message Jun 5, 2008 Char and misc drivers

lore

Share & tools

lore

Li Zefan

author

2008-06-05 01:23 UTC #0 lore raw

PATCH 1/1 drivers/char/rtc.c: fix build failure

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 <[email protected]>

---
 rtc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/char/rtc.c renamed from drivers/char/rtc.c.old +1 -1

@@ -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