diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-01 16:16:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-01 16:16:48 -0700 |
| commit | aea54bce01c44bf3e35ac016fcd584b0de137673 (patch) | |
| tree | 6325f046bb7b024bbfd1b05d864ee47f4480dffc /drivers | |
| parent | 3e878b8d54e0fc12df363ee8e4a638c8147aac98 (diff) | |
| parent | 0ac9ebedce444ec6f93cf6a995e4a20009191b00 (diff) | |
Merge branch 'for-next' of git://git2.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ieee802154/Makefile | 2 | ||||
| -rw-r--r-- | drivers/ieee802154/fakehard.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ieee802154/Makefile b/drivers/ieee802154/Makefile index 68999137ded..800a3894af0 100644 --- a/drivers/ieee802154/Makefile +++ b/drivers/ieee802154/Makefile @@ -1,3 +1 @@ obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o - -ccflags-y := -DDEBUG -DCONFIG_FFD diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c index a5a49a1baae..eb0e2ccc79a 100644 --- a/drivers/ieee802154/fakehard.c +++ b/drivers/ieee802154/fakehard.c @@ -370,8 +370,6 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev) return -ENOMEM; } - phy->dev.platform_data = dev; - memcpy(dev->dev_addr, "\xba\xbe\xca\xfe\xde\xad\xbe\xef", dev->addr_len); memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |