diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-21 17:51:08 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-21 17:51:08 +0100 |
| commit | 3035b675ad0377b2468b442068062e7f28771dda (patch) | |
| tree | 63cf26aa249d067ac12776dd2850ff017747f2b9 /drivers/net/ethernet/qualcomm/Kconfig | |
| parent | isofs: avoid unused function warning (diff) | |
| parent | ovl: ovl_dir_fsync() cleanup (diff) | |
| download | linux-3035b675ad0377b2468b442068062e7f28771dda.tar.xz linux-3035b675ad0377b2468b442068062e7f28771dda.zip | |
Merge branch 'overlayfs-current' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-linus
"The biggest change is to rename the filesystem from "overlayfs" to "overlay".
This will allow legacy overlayfs to be easily carried by distros alongside the
new mainline one. Also fix a couple of copy-up races and allow escaping comma
character in filenames."
The last bit is about commas in pathname mount options...
Diffstat (limited to 'drivers/net/ethernet/qualcomm/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qualcomm/Kconfig b/drivers/net/ethernet/qualcomm/Kconfig index f3a47147937d..9a49f42ac2ba 100644 --- a/drivers/net/ethernet/qualcomm/Kconfig +++ b/drivers/net/ethernet/qualcomm/Kconfig @@ -5,7 +5,6 @@ config NET_VENDOR_QUALCOMM bool "Qualcomm devices" default y - depends on SPI_MASTER && OF_GPIO ---help--- If you have a network (Ethernet) card belonging to this class, say Y and read the Ethernet-HOWTO, available from @@ -20,7 +19,7 @@ if NET_VENDOR_QUALCOMM config QCA7000 tristate "Qualcomm Atheros QCA7000 support" - depends on SPI_MASTER && OF_GPIO + depends on SPI_MASTER && OF ---help--- This SPI protocol driver supports the Qualcomm Atheros QCA7000. |