drivers/rtc/rtc-mxc.c: remove defines already included in rtc.h

[akpm@linux-foundation.org: retain the code comments]
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Vladimir Zapolskiy <vzapolskiy@gmail.com>
Cc: Alessandro Zummo <alessandro.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index d814417bee8c08b68224fafcbeb39e7ca405fd5d..39e41fbdf08ba6de6259347feb0cc5dee76803d7 100644 (file)
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -55,12 +55,6 @@ static const u32 PIE_BIT_DEF[MAX_PIE_NUM][2] = {
        { 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
 

diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 877ece45426f6c3eb0fa3850f0c93db0ee84468a..b27ebea25660bff86dbdf2f86040f26904ab45c7 100644 (file)
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -92,10 +92,10 @@ struct rtc_pll_info {
 #define RTC_PLL_SET    _IOW('p', 0x12, struct rtc_pll_info)  /* Set PLL correction */
 
 /* interrupt flags */
-#define RTC_IRQF 0x80 /* any of the following is active */
-#define RTC_PF 0x40
-#define RTC_AF 0x20
-#define RTC_UF 0x10
+#define RTC_IRQF 0x80  /* Any of the following is active */
+#define RTC_PF 0x40    /* Periodic interrupt */
+#define RTC_AF 0x20    /* Alarm interrupt */
+#define RTC_UF 0x10    /* Update interrupt for 1Hz RTC */
 
 #ifdef __KERNEL__