From b7366802d0cce6960e0fc0c4caafc4ab1c7583d9 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 11 Apr 2011 18:45:05 +0000 Subject: 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 Tested by: elguero Signed-off-by: Tzafrir Cohen Acked-by: Shaun Ruffell Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9894 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9895 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- include/dahdi/kernel.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 639a4f2..1819e13 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -87,7 +87,13 @@ #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) -#define dev_name(dev) (dev)->bus_id +# ifdef RHEL_RELEASE_VERSION +# if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6) +#define dev_name(dev) ((dev)->bus_id) +# endif +# else +#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 -- cgit v1.2.3