summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-09-30 18:09:42 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2009-09-30 18:09:42 +0000
commit2baba3425563c7293163d711e481516ae2b59246 (patch)
tree8cf4d16b92c47735a0c40d99ae582b4f78bf7f43 /include
parentd8052050454fd6d0ab8430384cb7131715087266 (diff)
move the dev->bus_id fix from xpp to kernel.h: needed elsewhere
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7293 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'include')
-rw-r--r--include/dahdi/kernel.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index cee9229..04d8dab 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -85,6 +85,12 @@
#endif
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+#define dev_name(dev) (dev)->bus_id
+#define dev_set_name(dev, format, ...) \
+ snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__);
+#endif
+
/*! Default chunk size for conferences and such -- static right now, might make
variable sometime. 8 samples = 1 ms = most frequent service interval possible
for a USB device */