diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /drivers/rtc | |
| parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
| parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-ds1553.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-ds1742.c | 2 |
2 files changed, 2 insertions, 2 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; |
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c index b2e5481ba3b6..67291b0f8283 100644 --- a/drivers/rtc/rtc-ds1742.c +++ b/drivers/rtc/rtc-ds1742.c | |||
| @@ -55,7 +55,7 @@ struct rtc_plat_data { | |||
| 55 | void __iomem *ioaddr_rtc; | 55 | void __iomem *ioaddr_rtc; |
| 56 | size_t size_nvram; | 56 | size_t size_nvram; |
| 57 | size_t size; | 57 | size_t size; |
| 58 | unsigned long baseaddr; | 58 | resource_size_t baseaddr; |
| 59 | unsigned long last_jiffies; | 59 | unsigned long last_jiffies; |
| 60 | }; | 60 | }; |
| 61 | 61 | ||