diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-28 11:11:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-28 11:11:16 -0400 |
| commit | c487606f835a93a725bac1aefd536be98f22474d (patch) | |
| tree | c77571a519905945e24a9ea6e4e44d9032fd527d /drivers/nfc/Makefile | |
| parent | d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1 (diff) | |
| parent | 97ea6d0f3eb019891038cd2dfddb749d6bf219be (diff) | |
| download | blackbird-op-linux-c487606f835a93a725bac1aefd536be98f22474d.tar.gz blackbird-op-linux-c487606f835a93a725bac1aefd536be98f22474d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
net/nfc/netlink.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/nfc/Makefile')
| -rw-r--r-- | drivers/nfc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile index 473e44cef612..bf05831fdf09 100644 --- a/drivers/nfc/Makefile +++ b/drivers/nfc/Makefile @@ -2,7 +2,6 @@ # Makefile for nfc devices # -obj-$(CONFIG_PN544_NFC) += pn544.o obj-$(CONFIG_PN544_HCI_NFC) += pn544_hci.o obj-$(CONFIG_NFC_PN533) += pn533.o obj-$(CONFIG_NFC_WILINK) += nfcwilink.o |
