diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-27 18:31:39 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-27 18:31:39 -0800 |
| commit | 9f6e055907362f6692185c1c9658295d24095c74 (patch) | |
| tree | a7dc22fa7481300c92c0a33b54a32cb9ee551b5f /arch/csky/include/asm/Kbuild | |
| parent | ec4a514a6870ee3a83fb8788635cf871ee32e665 (diff) | |
| parent | 7058b837899fc978c9f8a033fa29ab07360a85c8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The mptcp conflict was overlapping additions.
The SMC conflict was an additional and removal happening at the same
time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/csky/include/asm/Kbuild')
| -rw-r--r-- | arch/csky/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/csky/include/asm/Kbuild b/arch/csky/include/asm/Kbuild index bc15a26c782f..4130e3eaa766 100644 --- a/arch/csky/include/asm/Kbuild +++ b/arch/csky/include/asm/Kbuild @@ -28,7 +28,6 @@ generic-y += local64.h generic-y += mm-arch-hooks.h generic-y += mmiowb.h generic-y += module.h -generic-y += pci.h generic-y += percpu.h generic-y += preempt.h generic-y += qrwlock.h |