[dahdi-commits] sruffell: branch linux/2.6 r10572 - /linux/branches/2.6/drivers/dahdi/

[SVN commits to the DAHDI project]

Author: sruffell
Date: Wed Mar 21 14:36:32 2012
New Revision: 10572

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10572
Log:
remove a duplicate dev_set_name()

Remove duplicate definition from dahdi-sysfs.c

Signed-off-by: Oron Peled <oron.peled at xorcom.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10447

Modified:
    linux/branches/2.6/drivers/dahdi/dahdi-sysfs.c

Modified: linux/branches/2.6/drivers/dahdi/dahdi-sysfs.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.6/drivers/dahdi/dahdi-sysfs.c?view=diff&rev=10572&r1=10571&r2=10572
==============================================================================
--- linux/branches/2.6/drivers/dahdi/dahdi-sysfs.c (original)
+++ linux/branches/2.6/drivers/dahdi/dahdi-sysfs.c Wed Mar 21 14:36:32 2012
@@ -151,12 +151,6 @@
 		if (err)					\
 			return err;				\
 	} while (0)
-
-#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
 
 static int span_uevent(struct device *dev, char **envp, int num_envp,
 		char *buffer, int buffer_size)