diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-28 14:43:00 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-28 14:43:00 -0500 |
| commit | 4205e6ef4ee747aa81930537b6035086ba5f1e28 (patch) | |
| tree | b2ebe2b4621f5f531f283cb9bf0005cd3c04ca7b /drivers/nfc/pn544/Makefile | |
| parent | cef401de7be8c4e155c6746bfccf721a4fa5fab9 (diff) | |
| parent | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (diff) | |
| download | linux-4205e6ef4ee747aa81930537b6035086ba5f1e28.tar.gz linux-4205e6ef4ee747aa81930537b6035086ba5f1e28.tar.bz2 linux-4205e6ef4ee747aa81930537b6035086ba5f1e28.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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 |