The patch titled
drivers/char/rtc.c: fix build failure
has been removed from the -mm tree. Its filename was
rtc-push-the-bkl-down-into-the-driver-ioctl-method-fix.patch
This patch was dropped because it was folded into rtc-push-the-bkl-down-into-the-driver-ioctl-method.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: drivers/char/rtc.c: fix build failure
From: Li Zefan <lizf@xxxxxxxxxxxxxx>
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>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/rtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/char/rtc.c~rtc-push-the-bkl-down-into-the-driver-ioctl-method-fix drivers/char/rtc.c
--- a/drivers/char/rtc.c~rtc-push-the-bkl-down-into-the-driver-ioctl-method-fix
+++ a/drivers/char/rtc.c
@@ -145,7 +145,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);
#ifdef RTC_IRQ
static unsigned int rtc_poll(struct file *file, poll_table *wait);
diff -puN /dev/null /dev/null
_
Patches currently in -mm which might be from lizf@xxxxxxxxxxxxxx are
origin.patch
rtc-push-the-bkl-down-into-the-driver-ioctl-method.patch
rtc-push-the-bkl-down-into-the-driver-ioctl-method-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
