705d398aa433e31e884
parent 108c1961847df2a875047c0fd27b419cb817d213
author Stephen Rothwell <sfr@canb.auug.org.au> 1209959659 +1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1210025318 -0700

dev_name introduction fall out fix

Commit 06916639e2fed9ee475efef2747a1b7429f8fe76 ("driver-core: add
dev_name() to help transition away from using bus_id") added a static
inline dev_name() and used it in dev_printk.

Unfortunately, drivers/edac/edac_core.h defines a macro called
dev_name().  Rename the latter.

Diagnosis by Tony Breeds and Michael Ellerman.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
óa