The patch titled drivers/rtc/rtc-mxc.c: remove defines already included in rtc.h has been added to the -mm tree. Its filename is drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers/rtc/rtc-mxc.c: remove defines already included in rtc.h From: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> Cc: Vladimir Zapolskiy <vzapolskiy@xxxxxxxxx> Cc: Alessandro Zummo <alessandro.zummo@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-mxc.c | 6 ------ 1 file changed, 6 deletions(-) diff -puN drivers/rtc/rtc-mxc.c~drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch drivers/rtc/rtc-mxc.c --- a/drivers/rtc/rtc-mxc.c~drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch +++ a/drivers/rtc/rtc-mxc.c @@ -55,12 +55,6 @@ static const u32 PIE_BIT_DEF[MAX_PIE_NUM { MAX_PIE_FREQ, RTC_SAM7_BIT }, }; -/* Those are the bits from a classic RTC we want to mimic */ -#define RTC_IRQF 0x80 /* any of the following 3 is active */ -#define RTC_PF 0x40 /* Periodic interrupt */ -#define RTC_AF 0x20 /* Alarm interrupt */ -#define RTC_UF 0x10 /* Update interrupt for 1Hz RTC */ - #define MXC_RTC_TIME 0 #define MXC_RTC_ALARM 1 _ Patches currently in -mm which might be from w.sang@xxxxxxxxxxxxxx are linux-next.patch drivers-leds-leds-pca9532c-add-gpio-capability.patch rtc-add-rv3029c2-rtc-support.patch rtc-driver-for-pt7c4338-chip.patch drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch.patch drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch-fix.patch gpio-make-gpio_requestfree_array-gpio-array-parameter-const.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