---

yaml --- r: 340935 b: refs/heads/master c: 97f1841 h: refs/heads/master i: 340933: 36670d5 340931: 4713eec 340927: 6a2e4a1 v: v3
git-mirror · Oct 26, 2012 · 32e1b7e · 32e1b7e
1 parent 2600164
commit 32e1b7e
Show file tree

Hide file tree

Showing 7 changed files with 571 additions and 416 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 632c016ab8ba1f98262bd6242b38d73ee4ae652e
+refs/heads/master: 97f18414af395c547f20300e5d4c81d7190a4155
diff --git a/trunk/drivers/nfc/Makefile b/trunk/drivers/nfc/Makefile
@@ -2,7 +2,7 @@
 # Makefile for nfc devices
 #
 
-obj-$(CONFIG_PN544_HCI_NFC)	+= pn544_hci.o
+obj-$(CONFIG_PN544_HCI_NFC)	+= pn544/
 obj-$(CONFIG_NFC_PN533)		+= pn533.o
 obj-$(CONFIG_NFC_WILINK)	+= nfcwilink.o
 

diff --git a/trunk/drivers/nfc/pn544/Makefile b/trunk/drivers/nfc/pn544/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for PN544 HCI based NFC driver
+#
+
+obj-$(CONFIG_PN544_HCI_NFC)	+= pn544_i2c.o
+
+pn544_i2c-y		:= pn544.o i2c.o