diff options
Diffstat (limited to 'drivers/ieee802154')
-rw-r--r-- | drivers/ieee802154/Makefile | 2 | ||||
-rw-r--r-- | drivers/ieee802154/fakehard.c | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/ieee802154/Makefile b/drivers/ieee802154/Makefile index e0e8e1a184ff..68999137dedf 100644 --- a/drivers/ieee802154/Makefile +++ b/drivers/ieee802154/Makefile | |||
@@ -1,3 +1,3 @@ | |||
1 | obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o | 1 | obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o |
2 | 2 | ||
3 | EXTRA_CFLAGS += -DDEBUG -DCONFIG_FFD | 3 | ccflags-y := -DDEBUG -DCONFIG_FFD |
diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c index d9d0e13efe47..a5a49a1baae7 100644 --- a/drivers/ieee802154/fakehard.c +++ b/drivers/ieee802154/fakehard.c | |||
@@ -393,16 +393,6 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev) | |||
393 | priv = netdev_priv(dev); | 393 | priv = netdev_priv(dev); |
394 | priv->phy = phy; | 394 | priv->phy = phy; |
395 | 395 | ||
396 | /* | ||
397 | * If the name is a format string the caller wants us to do a | ||
398 | * name allocation. | ||
399 | */ | ||
400 | if (strchr(dev->name, '%')) { | ||
401 | err = dev_alloc_name(dev, dev->name); | ||
402 | if (err < 0) | ||
403 | goto out; | ||
404 | } | ||
405 | |||
406 | wpan_phy_set_dev(phy, &pdev->dev); | 396 | wpan_phy_set_dev(phy, &pdev->dev); |
407 | SET_NETDEV_DEV(dev, &phy->dev); | 397 | SET_NETDEV_DEV(dev, &phy->dev); |
408 | 398 | ||