diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
commit | 11dd60447e3b1018f9cae66737cb902b519d3454 (patch) | |
tree | a33d8bcb18a3becae2161aa215c25d5674626c57 /drivers/net/appletalk/Kconfig | |
parent | 8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff) | |
parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
download | blackbird-op-linux-11dd60447e3b1018f9cae66737cb902b519d3454.tar.gz blackbird-op-linux-11dd60447e3b1018f9cae66737cb902b519d3454.zip |
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'drivers/net/appletalk/Kconfig')
-rw-r--r-- | drivers/net/appletalk/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig index 4ce6ca5f3d36..dc6b78e5342f 100644 --- a/drivers/net/appletalk/Kconfig +++ b/drivers/net/appletalk/Kconfig @@ -40,7 +40,7 @@ config DEV_APPLETALK config LTPC tristate "Apple/Farallon LocalTalk PC support" - depends on DEV_APPLETALK && (ISA || EISA) && ISA_DMA_API + depends on DEV_APPLETALK && (ISA || EISA) && ISA_DMA_API && VIRT_TO_BUS help This allows you to use the AppleTalk PC card to connect to LocalTalk networks. The card is also known as the Farallon PhoneNet PC card. |