summaryrefslogtreecommitdiffstats
path: root/crypto/deflate.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-05-05 05:54:19 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-06 00:08:38 +0200
commit17aa7e034416e3080bc57a786d09ba0a4a044561 (patch)
tree62ec5b3903e908ec544ce705d398aa433e31e884 /crypto/deflate.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff)
downloadlinux-17aa7e034416e3080bc57a786d09ba0a4a044561.tar.xz
linux-17aa7e034416e3080bc57a786d09ba0a4a044561.zip
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>
Diffstat (limited to 'crypto/deflate.c')
0 files changed, 0 insertions, 0 deletions