diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-12-10 15:48:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-10 15:48:20 -0500 |
| commit | 22f10923dd39141785273e423b9acf347297e15f (patch) | |
| tree | cc1f19103817433a426b3e329d6326f5e9d8e8f7 /include/uapi/linux/Kbuild | |
| parent | irda: Convert function pointer arrays and uses to const (diff) | |
| parent | net: fix suspicious rcu_dereference_check in net/sched/sch_fq_codel.c (diff) | |
| download | linux-dev-22f10923dd39141785273e423b9acf347297e15f.tar.xz linux-dev-22f10923dd39141785273e423b9acf347297e15f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
drivers/net/ethernet/renesas/sh_eth.c
Overlapping changes in both conflict cases.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/Kbuild')
| -rw-r--r-- | include/uapi/linux/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index a1e8175cc488..5b6a36cb77fb 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -429,7 +429,7 @@ header-y += virtio_net.h header-y += virtio_pci.h header-y += virtio_ring.h header-y += virtio_rng.h -header=y += vm_sockets.h +header-y += vm_sockets.h header-y += vt.h header-y += wait.h header-y += wanrouter.h |