diff options
author | David S. Miller <davem@davemloft.net> | 2015-10-02 17:21:25 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-02 17:21:25 +0300 |
commit | f6d3125fa3c2f55ddf7cf69365c41089de6cfae6 (patch) | |
tree | ff2bcb135ebf090d7b383d55123b621f4590632c /drivers/staging/most/hdm-usb/Kconfig | |
parent | 2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb (diff) | |
parent | 36f8dafe52b0d0726edd5102900e37192f1d3c65 (diff) | |
download | linux-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/dsa/slave.c
net/dsa/slave.c simply had overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/most/hdm-usb/Kconfig')
-rw-r--r-- | drivers/staging/most/hdm-usb/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/most/hdm-usb/Kconfig b/drivers/staging/most/hdm-usb/Kconfig index a482c3fdf34b..ec1546312ee6 100644 --- a/drivers/staging/most/hdm-usb/Kconfig +++ b/drivers/staging/most/hdm-usb/Kconfig @@ -4,7 +4,7 @@ config HDM_USB tristate "USB HDM" - depends on USB + depends on USB && NET select AIM_NETWORK ---help--- Say Y here if you want to connect via USB to network tranceiver. |