diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:03:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:03:36 -0400 |
| commit | 204d1641d200709c759d8c269458cbc7de378c40 (patch) | |
| tree | ce88690b4422078883f1651537ccd1f5d8ed7258 /drivers/Makefile | |
| parent | 31817df025e24559a01d33ddd68bd11b21bf9d7b (diff) | |
| parent | 5f0dd296a01c8173fcc05a8b262a1168ae90bc74 (diff) | |
| download | linux-stable-204d1641d200709c759d8c269458cbc7de378c40.tar.gz linux-stable-204d1641d200709c759d8c269458cbc7de378c40.tar.bz2 linux-stable-204d1641d200709c759d8c269458cbc7de378c40.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 09f3232bcdcd..1bc896571a3a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -122,3 +122,4 @@ obj-y += ieee802154/ obj-y += clk/ obj-$(CONFIG_HWSPINLOCK) += hwspinlock/ +obj-$(CONFIG_NFC) += nfc/ |