diff options
| author | Len Brown <len.brown@intel.com> | 2008-04-30 13:59:05 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-04-30 13:59:05 -0400 |
| commit | 008238b54ac2350babf195084ecedbcf7851a202 (patch) | |
| tree | a7cc18ea0403f4478883a3e36a6f0d2bf67eef3e /drivers/rtc | |
| parent | 96916090f488986a4ebb8e9ffa6a3b50881d5ccd (diff) | |
| parent | dfd2e1b4e6eb46ff59c7e1c1111c967b8b5981c1 (diff) | |
Merge branch 'pnp' into release
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-cmos.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index dcdc142a3441..d060a06ce05b 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
| @@ -854,11 +854,12 @@ cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) | |||
| 854 | * don't define the IRQ. It should always be safe to | 854 | * don't define the IRQ. It should always be safe to |
| 855 | * hardcode it in these cases | 855 | * hardcode it in these cases |
| 856 | */ | 856 | */ |
| 857 | return cmos_do_probe(&pnp->dev, &pnp->res.port_resource[0], 8); | 857 | return cmos_do_probe(&pnp->dev, |
| 858 | pnp_get_resource(pnp, IORESOURCE_IO, 0), 8); | ||
| 858 | else | 859 | else |
| 859 | return cmos_do_probe(&pnp->dev, | 860 | return cmos_do_probe(&pnp->dev, |
| 860 | &pnp->res.port_resource[0], | 861 | pnp_get_resource(pnp, IORESOURCE_IO, 0), |
| 861 | pnp->res.irq_resource[0].start); | 862 | pnp_irq(pnp, 0)); |
| 862 | } | 863 | } |
| 863 | 864 | ||
| 864 | static void __exit cmos_pnp_remove(struct pnp_dev *pnp) | 865 | static void __exit cmos_pnp_remove(struct pnp_dev *pnp) |