diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/ieee802154 | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/ieee802154')
| -rw-r--r-- | drivers/ieee802154/Makefile | 2 |
1 files changed, 1 insertions, 1 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 |