diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /drivers/rtc/rtc-ds1553.c | |
| parent | b37bde147890c8fea8369a5a4e230dabdea4ebfb (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
Merge Linux 2.6.23
Diffstat (limited to 'drivers/rtc/rtc-ds1553.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1553.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index 46da5714932c..5ab3492817d1 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | struct rtc_plat_data { | 61 | struct rtc_plat_data { |
| 62 | struct rtc_device *rtc; | 62 | struct rtc_device *rtc; |
| 63 | void __iomem *ioaddr; | 63 | void __iomem *ioaddr; |
| 64 | unsigned long baseaddr; | 64 | resource_size_t baseaddr; |
| 65 | unsigned long last_jiffies; | 65 | unsigned long last_jiffies; |
| 66 | int irq; | 66 | int irq; |
| 67 | unsigned int irqen; | 67 | unsigned int irqen; |