diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-04-11 18:41:47 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-04-11 18:41:47 +0000 |
| commit | 0de04f224bc113fb8a618c2008a67ddd93a63a75 (patch) | |
| tree | 16ebca37b5df4f97f7bb171c080aefe59cb72385 /include | |
| parent | 538dcaffdfe371e618cb6ea7cf69b174e2528c6a (diff) | |
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 <tzafrir.cohen@xorcom.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9894 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'include')
| -rw-r--r-- | include/dahdi/kernel.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 5b04918..6b5f4a4 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 |