diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 12:17:11 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 12:17:11 +1100 |
commit | fc5767c1649ac59f36edb3d593d6aae3ea9f5d46 (patch) | |
tree | 59db60c720dd64ee0ee24d79ab0b202b20622782 /kernel/power | |
parent | dfefb4a8bba145e0e2712bb3e5eef4bc807d47fb (diff) | |
parent | 77bc13253b537968208927fed966d34fee912e18 (diff) |
Merge branch 'quilt/driver-core'
Conflicts:
arch/powerpc/platforms/85xx/mpc85xx_mds.c
Diffstat (limited to 'kernel/power')
-rw-r--r-- | kernel/power/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 613f16941b85..239988873971 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -615,7 +615,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state) /* this may fail if the RTC hasn't been initialized */ status = rtc_read_time(rtc, &alm.time); if (status < 0) { - printk(err_readtime, rtc->dev.bus_id, status); + printk(err_readtime, dev_name(&rtc->dev), status); return; } rtc_tm_to_time(&alm.time, &now); @@ -626,7 +626,7 @@ static void __init test_wakealarm(struct rtc_device *rtc, suspend_state_t state) status = rtc_set_alarm(rtc, &alm); if (status < 0) { - printk(err_wakealarm, rtc->dev.bus_id, status); + printk(err_wakealarm, dev_name(&rtc->dev), status); return; } @@ -660,7 +660,7 @@ static int __init has_wakealarm(struct device *dev, void *name_ptr) if (!device_may_wakeup(candidate->dev.parent)) return 0; - *(char **)name_ptr = dev->bus_id; + *(const char **)name_ptr = dev_name(dev); return 1; } |