diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
| commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
| tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /drivers/rtc/rtc-mxc.c | |
| parent | 3c955b407a084810f57260d61548cc92c14bc627 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
Diffstat (limited to 'drivers/rtc/rtc-mxc.c')
| -rw-r--r-- | drivers/rtc/rtc-mxc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c index 25ec921db07c..0b06c1e03fd5 100644 --- a/drivers/rtc/rtc-mxc.c +++ b/drivers/rtc/rtc-mxc.c | |||
| @@ -83,12 +83,6 @@ struct rtc_plat_data { | |||
| 83 | void __iomem *ioaddr; | 83 | void __iomem *ioaddr; |
| 84 | int irq; | 84 | int irq; |
| 85 | struct clk *clk; | 85 | struct clk *clk; |
| 86 | unsigned int irqen; | ||
| 87 | int alrm_sec; | ||
| 88 | int alrm_min; | ||
| 89 | int alrm_hour; | ||
| 90 | int alrm_mday; | ||
| 91 | struct timespec mxc_rtc_delta; | ||
| 92 | struct rtc_time g_rtc_alarm; | 86 | struct rtc_time g_rtc_alarm; |
| 93 | }; | 87 | }; |
| 94 | 88 | ||
