diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-20 09:08:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-20 09:08:27 -0400 |
| commit | 26440c835f8b1a491e2704118ac55bf87334366c (patch) | |
| tree | 3c2d23b59fd49b252fdbf6c09efc41b354933fc6 /drivers/bus/Kconfig | |
| parent | 371f1c7e0d854796adc622cc3bacfcc5fc638db1 (diff) | |
| parent | 1099f86044111e9a7807f09523e42d4c9d0fb781 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/asix_common.c
net/ipv4/inet_connection_sock.c
net/switchdev/switchdev.c
In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.
The other two conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bus/Kconfig')
| -rw-r--r-- | drivers/bus/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index 1a82f3a17681..0ebca8ba7bc4 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig | |||
| @@ -36,7 +36,6 @@ config ARM_CCI400_PORT_CTRL | |||
| 36 | 36 | ||
| 37 | config ARM_CCI500_PMU | 37 | config ARM_CCI500_PMU |
| 38 | bool "ARM CCI500 PMU support" | 38 | bool "ARM CCI500 PMU support" |
| 39 | default y | ||
| 40 | depends on (ARM && CPU_V7) || ARM64 | 39 | depends on (ARM && CPU_V7) || ARM64 |
| 41 | depends on PERF_EVENTS | 40 | depends on PERF_EVENTS |
| 42 | select ARM_CCI_PMU | 41 | select ARM_CCI_PMU |