[PATCH -mmotm] drivers/char/rtc.c: fix build failure

From: Li Zefan
Date: Wed Jun 04 2008 - 21:23:46 EST



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@xxxxxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/