[svn-commits] tzafrir: linux/trunk r7293 - in /linux/trunk: drivers/dahdi/xpp/ include/dahdi/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Sep 30 13:09:42 2009
New Revision: 7293

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7293
Log:
move the dev->bus_id fix from xpp to kernel.h: needed elsewhere

Modified:
    linux/trunk/drivers/dahdi/xpp/xdefs.h
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/xpp/xdefs.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xdefs.h?view=diff&rev=7293&r1=7292&r2=7293
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xdefs.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xdefs.h Wed Sep 30 13:09:42 2009
@@ -138,11 +138,6 @@
 #define	DRIVER_ATTR_READER(name,drv,buf)	\
 		ssize_t name(struct device_driver *drv, char * buf)
 
-#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
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
 #define	SET_PROC_DIRENTRY_OWNER(p)	do { (p)->owner = THIS_MODULE; } while(0);
 #else

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=7293&r1=7292&r2=7293
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Wed Sep 30 13:09:42 2009
@@ -83,6 +83,12 @@
 #define dev_notice(dev, format, arg...)         \
         dev_printk(KERN_NOTICE , dev , format , ## arg)
 #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