diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 10:43:38 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 10:43:38 +1100 |
| commit | 79d5fcf506b11a2a724324e90cd2e5facbf862ee (patch) | |
| tree | 444d6a1b79e6de01b139bded0f195e8babb7a513 /arch/avr32 | |
| parent | bb39e60111deae8bb5aa81fc533b6628fe544a3d (diff) | |
| parent | 19aef85cbaf1eb23bee7cd21db11c72bae25ba7e (diff) | |
Merge branch 'quilt/driver-core'
Conflicts:
arch/powerpc/platforms/85xx/mpc85xx_mds.c
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/mach-at32ap/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c index 138a00a2a2d0..442f08c5e641 100644 --- a/arch/avr32/mach-at32ap/clock.c +++ b/arch/avr32/mach-at32ap/clock.c @@ -198,7 +198,7 @@ dump_clock(struct clk *parent, struct clkinf *r) unsigned i; /* skip clocks coupled to devices that aren't registered */ - if (parent->dev && !parent->dev->bus_id[0] && !parent->users) + if (parent->dev && !dev_name(parent->dev) && !parent->users) return; /* <nest spaces> name <pad to end> */ @@ -214,7 +214,7 @@ dump_clock(struct clk *parent, struct clkinf *r) parent->users ? "on" : "off", /* NOTE: not-paranoid!! */ clk_get_rate(parent)); if (parent->dev) - seq_printf(r->s, ", for %s", parent->dev->bus_id); + seq_printf(r->s, ", for %s", dev_name(parent->dev)); seq_printf(r->s, "\n"); /* cost of this scan is small, but not linear... */ |