diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-29 15:08:47 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-29 15:08:47 -0400 |
| commit | a8a48e60a468084ef6ec23c78e8903c9e0ba7a4c (patch) | |
| tree | 74ee5f70d6930e0fd6b54975d3c903d4eeb7a7c4 /net/rds/rdma.c | |
| parent | cc0446bfeb3a9038c881db77d30c68a2beb4fa60 (diff) | |
| parent | c204ea092eead40d2ac577fc3b5c77052ec22a59 (diff) | |
| download | linux-a8a48e60a468084ef6ec23c78e8903c9e0ba7a4c.tar.gz | |
Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says:
"With this one we have:
- One patch for moving the LLCP code into net/nfc.
It fixes a build annoyance reported by Dave Miller caused by the fact
that the LLCP code object targets are not in the same directory as the
Makefile trying to build them is. It prevents us from doing e.g.
make net/nfc/llcp/sock.o
Moving the LLCP code into net/nfc and not making it optional anymore
makes sense as LLCP is a fundamental piece of the NFC specifications
and thus should be in the core NFC directory.
- One patch that fixes the missing dependency against RFKILL. Without it NFC
fails to properly build when it's builtin and CONFIG_RFKILL=m."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/rds/rdma.c')
0 files changed, 0 insertions, 0 deletions