diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-01-29 12:16:22 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-29 12:16:22 +0100 |
| commit | 448cd55c37dc3ea30705c4826ac3e7dbbcb74aa2 (patch) | |
| tree | ac1b09f416944e50119b31165d6c8bca47e6ca77 /drivers/nfc/pn544/Makefile | |
| parent | mac80211: fix mesh_sta_info_get() reshuffle damage (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-448cd55c37dc3ea30705c4826ac3e7dbbcb74aa2.tar.xz linux-448cd55c37dc3ea30705c4826ac3e7dbbcb74aa2.zip | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Diffstat (limited to 'drivers/nfc/pn544/Makefile')
| -rw-r--r-- | drivers/nfc/pn544/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/nfc/pn544/Makefile b/drivers/nfc/pn544/Makefile index 725733881eb3..ac076793687d 100644 --- a/drivers/nfc/pn544/Makefile +++ b/drivers/nfc/pn544/Makefile @@ -2,6 +2,7 @@ # Makefile for PN544 HCI based NFC driver # -obj-$(CONFIG_PN544_HCI_NFC) += pn544_i2c.o +pn544_i2c-objs = i2c.o -pn544_i2c-y := pn544.o i2c.o +obj-$(CONFIG_NFC_PN544) += pn544.o +obj-$(CONFIG_NFC_PN544_I2C) += pn544_i2c.o |