diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-04-11 18:45:05 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-04-11 18:45:05 +0000 |
| commit | b7366802d0cce6960e0fc0c4caafc4ab1c7583d9 (patch) | |
| tree | 2fb9b2994a9d95075c0fca483aecee5608634247 | |
| parent | c00d1d908bbf81bb669c27b2d5e0d4f4eb2f7f6d (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>
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
| -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 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 |