Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9796cc96 authored by Wolfram Sang's avatar Wolfram Sang Committed by Linus Torvalds
Browse files

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



[akpm@linux-foundation.org: retain the code comments]
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: Vladimir Zapolskiy <vzapolskiy@gmail.com>
Cc: Alessandro Zummo <alessandro.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d62b8f5

drivers/rtc/rtc-mxc.c

+0 −6
Original line number Diff line number Diff line
@@ -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

include/linux/rtc.h

+4 −4
Original line number Diff line number Diff line
@@ -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__