---

yaml
---
r: 328287
b: refs/heads/master
c: 7b55279
h: refs/heads/master
i:
  328285: 3e6e0a6
  328283: 4d14cb7
  328279: 7332057
  328271: 9be6b97
  328255: 277433a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80faa59847108d48928fac41b4817ef21ca108a9
+refs/heads/master: 7b55279f6a454771d06e8ddf4a7114d17ae9a741

trunk/Documentation/feature-removal-schedule.txt

@@ -516,18 +516,6 @@ Who:	Kees Cook <keescook@chromium.org>
 
 ----------------------------
 
-What:	Removing the pn544 raw driver.
-When:	3.6
-Why:	With the introduction of the NFC HCI and SHDL kernel layers, pn544.c
-	is being replaced by pn544_hci.c which is accessible through the netlink
-	and socket NFC APIs. Moreover, pn544.c is outdated and does not seem to
-	work properly with the latest Android stacks.
-	Having 2 drivers for the same hardware is confusing and as such we
-	should only keep the one following the kernel NFC APIs.
-Who:	Samuel Ortiz <sameo@linux.intel.com>
-
-----------------------------
-
 What:	setitimer accepts user NULL pointer (value)
 When:	3.6
 Why:	setitimer is not returning -EFAULT if user pointer is NULL. This

trunk/drivers/nfc/Kconfig

@@ -5,18 +5,6 @@
 menu "Near Field Communication (NFC) devices"
 	depends on NFC
 
-config PN544_NFC
-	tristate "PN544 NFC driver"
-	depends on I2C
-	select CRC_CCITT
-	default n
-	---help---
-	  Say yes if you want PN544 Near Field Communication driver.
-	  This is for i2c connected version. If unsure, say N here.
-
-	  To compile this driver as a module, choose m here. The module will
-	  be called pn544.
-
 config PN544_HCI_NFC
 	tristate "HCI PN544 NFC driver"
 	depends on I2C && NFC_HCI && NFC_SHDLC

trunk/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