From f86080371ffff20f44adf21d1df24d3e00918c44 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Sat, 9 Apr 2011 18:10:51 -0500 Subject: [PATCH] dahdi: Do not define dev_name if already backported. RHEL 5.6 has backported dev_name in include/dahdi/devices.h. We now need to check for a back ported definition before defining our own version on pre 2.6.26 kernels. (closes issue #18992) Reported by: ndupeux, AlexCeli Signed-off-by: Shaun Ruffell --- drivers/dahdi/Kbuild | 5 +++++ include/dahdi/kernel.h | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index ec881dc..ec029a6 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -68,6 +68,11 @@ ifeq (1,$(shell fgrep -q 'wait_for_completion_timeout' include/linux/completion. CFLAGS_MODULE+=-DHAVE_WAIT_FOR_COMPLETION_TIMEOUT=1 endif +# RHEL 5.6 backported dev_name +ifeq (1,$(shell fgrep -q "dev_name" $(srctree)/include/linux/device.h 2> /dev/null && echo 1)) +CFLAGS_MODULE+=-DHAVE_DEV_NAME=1 +endif + # In 2.6.18 skb_linearize changed; however, some distros backported the change ifneq (,$(wildcard $(srctree)/include/linux/skbuff.h)) ifeq ($(shell grep "skb_linearize.*(.*, .* gfp)" $(srctree)/include/linux/skbuff.h),) diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 5b04918..5b530ff 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -87,7 +87,9 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) +#ifndef HAVE_DEV_NAME #define dev_name(dev) (dev)->bus_id +#endif #define dev_set_name(dev, format, ...) \ snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__); #endif -- 1.7.4.1.48.g5673d