summaryrefslogtreecommitdiff
path: root/include/dahdi/kernel.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/dahdi/kernel.h')
-rw-r--r--include/dahdi/kernel.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index e425420..9607fd2 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -99,16 +99,25 @@
#endif
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
# ifdef RHEL_RELEASE_VERSION
# if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6)
#define dev_name(dev) ((dev)->bus_id)
+#define dev_set_name(dev, format, ...) \
+ snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__)
+# else
+#define dev_set_name(dev, format, ...) \
+ do { \
+ kobject_set_name(&(dev)->kobj, format, ## __VA_ARGS__); \
+ snprintf((dev)->bus_id, BUS_ID_SIZE, \
+ kobject_name(&(dev)->kobj)); \
+ } while (0)
# 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__);
+ snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__)
+# endif
#endif
/*! Default chunk size for conferences and such -- static right now, might make