diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-07-25 13:59:46 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-25 14:53:52 -0400 |
| commit | 5f00bcb38ef9a980a33c6dbdc0044964b05f22dd (patch) | |
| tree | 3175fb9375aecb50bde1be0bf4fa8aa8155131d6 /net/nfc/Makefile | |
| parent | 34006cee28f7344f9557a4be3816c7891b1bbab1 (diff) | |
| parent | b6844e8f64920cdee620157252169ba63afb0c89 (diff) | |
Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
vfs/nfs: fixup for nfs_open_context change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/nfc/Makefile')
| -rw-r--r-- | net/nfc/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/nfc/Makefile b/net/nfc/Makefile new file mode 100644 index 00000000000..16250c35385 --- /dev/null +++ b/net/nfc/Makefile | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | # | ||
| 2 | # Makefile for the Linux NFC subsystem. | ||
| 3 | # | ||
| 4 | |||
| 5 | obj-$(CONFIG_NFC) += nfc.o | ||
| 6 | |||
| 7 | nfc-objs := core.o netlink.o af_nfc.o rawsock.o | ||