diff options
author | Matti J. Aaltonen <matti.j.aaltonen@nokia.com> | 2011-01-12 20:00:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 11:03:19 -0500 |
commit | 0329326e85aaa30fb8d427828c718d565c287385 (patch) | |
tree | ab6d9c1e9c6a56ebca273b9d36d76a4a3eb60b23 /drivers/Makefile | |
parent | 6164281ab7a4d3bd42588d6b25984e960a2e032f (diff) |
NFC: Driver for NXP Semiconductors PN544 NFC chip.
Creates a new "Near Field Communication" subsystem in drivers/nfc.
http://en.wikipedia.org/wiki/Near_Field_Communication is useful ;)
This is a driver for the pn544 NFC device. The driver transfers
ETSI messages between the device and the user space.
Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@nokia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/Makefile')
-rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index bf15ce7493d..ef5132469f5 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -40,7 +40,7 @@ obj-$(CONFIG_FB_INTEL) += video/intelfb/ | |||
40 | 40 | ||
41 | obj-y += serial/ | 41 | obj-y += serial/ |
42 | obj-$(CONFIG_PARPORT) += parport/ | 42 | obj-$(CONFIG_PARPORT) += parport/ |
43 | obj-y += base/ block/ misc/ mfd/ | 43 | obj-y += base/ block/ misc/ mfd/ nfc/ |
44 | obj-$(CONFIG_NUBUS) += nubus/ | 44 | obj-$(CONFIG_NUBUS) += nubus/ |
45 | obj-y += macintosh/ | 45 | obj-y += macintosh/ |
46 | obj-$(CONFIG_IDE) += ide/ | 46 | obj-$(CONFIG_IDE) += ide/ |