diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/dahdi/kernel.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 3b96c97..a0c96ae 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -79,16 +79,25 @@ #define DAHDI_IRQ_DISABLED IRQF_DISABLED #define DAHDI_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED -#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__) +# endif #endif /*! Default chunk size for conferences and such -- static right now, might make |