Commit 7b55279f authored by Cong Wang's avatar Cong Wang Committed by Samuel Ortiz

NFC: Remove the pn544 raw driver

This was scheduled for 3.6, we're late.
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 80faa598
...@@ -516,18 +516,6 @@ Who: Kees Cook <keescook@chromium.org> ...@@ -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) What: setitimer accepts user NULL pointer (value)
When: 3.6 When: 3.6
Why: setitimer is not returning -EFAULT if user pointer is NULL. This Why: setitimer is not returning -EFAULT if user pointer is NULL. This
......
...@@ -5,18 +5,6 @@ ...@@ -5,18 +5,6 @@
menu "Near Field Communication (NFC) devices" menu "Near Field Communication (NFC) devices"
depends on NFC 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 config PN544_HCI_NFC
tristate "HCI PN544 NFC driver" tristate "HCI PN544 NFC driver"
depends on I2C && NFC_HCI && NFC_SHDLC depends on I2C && NFC_HCI && NFC_SHDLC
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# Makefile for nfc devices # Makefile for nfc devices
# #
obj-$(CONFIG_PN544_NFC) += pn544.o
obj-$(CONFIG_PN544_HCI_NFC) += pn544_hci.o obj-$(CONFIG_PN544_HCI_NFC) += pn544_hci.o
obj-$(CONFIG_NFC_PN533) += pn533.o obj-$(CONFIG_NFC_PN533) += pn533.o
obj-$(CONFIG_NFC_WILINK) += nfcwilink.o obj-$(CONFIG_NFC_WILINK) += nfcwilink.o
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment