diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /drivers/net/hamradio/Kconfig | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'drivers/net/hamradio/Kconfig')
| -rw-r--r-- | drivers/net/hamradio/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 34068f81d45e..7cdebe1a0b61 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
| @@ -45,7 +45,7 @@ config BPQETHER | |||
| 45 | 45 | ||
| 46 | config DMASCC | 46 | config DMASCC |
| 47 | tristate "High-speed (DMA) SCC driver for AX.25" | 47 | tristate "High-speed (DMA) SCC driver for AX.25" |
| 48 | depends on ISA && AX25 && BROKEN_ON_SMP | 48 | depends on ISA && AX25 && BROKEN_ON_SMP && ISA_DMA_API |
| 49 | ---help--- | 49 | ---help--- |
| 50 | This is a driver for high-speed SCC boards, i.e. those supporting | 50 | This is a driver for high-speed SCC boards, i.e. those supporting |
| 51 | DMA on one port. You usually use those boards to connect your | 51 | DMA on one port. You usually use those boards to connect your |
| @@ -78,7 +78,7 @@ config DMASCC | |||
| 78 | 78 | ||
| 79 | config SCC | 79 | config SCC |
| 80 | tristate "Z8530 SCC driver" | 80 | tristate "Z8530 SCC driver" |
| 81 | depends on ISA && AX25 | 81 | depends on ISA && AX25 && ISA_DMA_API |
| 82 | ---help--- | 82 | ---help--- |
| 83 | These cards are used to connect your Linux box to an amateur radio | 83 | These cards are used to connect your Linux box to an amateur radio |
| 84 | in order to communicate with other computers. If you want to use | 84 | in order to communicate with other computers. If you want to use |