Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6] / drivers / net / hamradio / Kconfig

diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 34068f81d45ef1c2d200ed77b661b7b341118046..896aa02000d73079fc1ebda3b222c90cdfe3531e 100644 (file)
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -1,6 +1,7 @@
 config MKISS
        tristate "Serial port KISS driver"
-       depends on AX25 && BROKEN_ON_SMP
+       depends on AX25
+       select CRC16
        ---help---
          KISS is a protocol used for the exchange of data between a computer
          and a Terminal Node Controller (a small embedded system commonly
@@ -17,7 +18,7 @@ config MKISS
 
 config 6PACK
        tristate "Serial port 6PACK driver"
-       depends on AX25 && BROKEN_ON_SMP
+       depends on AX25
        ---help---
          6pack is a transmission protocol for the data exchange between your
          PC and your TNC (the Terminal Node Controller acts as a kind of
@@ -45,7 +46,7 @@ config BPQETHER
 
 config DMASCC
        tristate "High-speed (DMA) SCC driver for AX.25"
-       depends on ISA && AX25 && BROKEN_ON_SMP
+       depends on ISA && AX25 && BROKEN_ON_SMP && ISA_DMA_API
        ---help---
          This is a driver for high-speed SCC boards, i.e. those supporting
          DMA on one port. You usually use those boards to connect your
@@ -78,7 +79,7 @@ config DMASCC
 
 config SCC
        tristate "Z8530 SCC driver"
-       depends on ISA && AX25
+       depends on ISA && AX25 && ISA_DMA_API
        ---help---
          These cards are used to connect your Linux box to an amateur radio
          in order to communicate with other computers. If you want to use