diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2012-03-21 19:36:32 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2012-03-21 19:36:32 +0000 |
| commit | 3b56bef32d8e0e6b4ba1f4a48ca8b8fd49546601 (patch) | |
| tree | 5e4ad7493a55640f59ad916a6a18f031c9475792 | |
| parent | 9ea13e27ba8210da9661a7514e93aa8bbd0be265 (diff) | |
remove a duplicate dev_set_name()
Remove duplicate definition from dahdi-sysfs.c
Signed-off-by: Oron Peled <oron.peled@xorcom.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10447
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.6@10572 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/dahdi-sysfs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c index 3e6d157..14824ca 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -152,12 +152,6 @@ static int span_hotplug(struct device *dev, char **envp, int envnum, 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) { |