diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
tree | 022276b3625a432c7132e39776e7e448445087ac /drivers/net/appletalk/Kconfig | |
parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 60b19679ca5c..69c488d933a2 100644 --- a/drivers/net/appletalk/Kconfig +++ b/drivers/net/appletalk/Kconfig | |||
@@ -13,7 +13,7 @@ config DEV_APPLETALK | |||
13 | 13 | ||
14 | config LTPC | 14 | config LTPC |
15 | tristate "Apple/Farallon LocalTalk PC support" | 15 | tristate "Apple/Farallon LocalTalk PC support" |
16 | depends on DEV_APPLETALK && (ISA || EISA) | 16 | depends on DEV_APPLETALK && (ISA || EISA) && ISA_DMA_API |
17 | help | 17 | help |
18 | This allows you to use the AppleTalk PC card to connect to LocalTalk | 18 | This allows you to use the AppleTalk PC card to connect to LocalTalk |
19 | networks. The card is also known as the Farallon PhoneNet PC card. | 19 | networks. The card is also known as the Farallon PhoneNet PC card. |