]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
dev_name introduction fall out fix
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 May 2008 03:54:19 +0000 (13:54 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 May 2008 22:08:38 +0000 (15:08 -0700)
commit17aa7e034416e3080bc57a786d09ba0a4a044561
tree62ec5b3903e908ec544ce705d398aa433e31e884
parent108c1961847df2a875047c0fd27b419cb817d213
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>
drivers/edac/edac_core.h
drivers/edac/edac_device.c
drivers/edac/edac_mc.c
drivers/edac/edac_pci.c