diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-31 19:49:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-31 19:49:07 -0400 |
commit | be2ac68f7b66e90b8d25c168fc4d033b034f5c43 (patch) | |
tree | fade4d5cc3dda24334c9927b009cbc9dcaf67a10 /drivers/net/hamradio/Kconfig | |
parent | e0b98c79e605f64f263ede53344f283f5e0548be (diff) | |
parent | e064cd7e3ac797df1e81b55ff4fed5fca5d106b5 (diff) |
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/hamradio/Kconfig')
-rw-r--r-- | drivers/net/hamradio/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 7cdebe1a0b61..0cd54306e636 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
@@ -17,7 +17,7 @@ config MKISS | |||
17 | 17 | ||
18 | config 6PACK | 18 | config 6PACK |
19 | tristate "Serial port 6PACK driver" | 19 | tristate "Serial port 6PACK driver" |
20 | depends on AX25 && BROKEN_ON_SMP | 20 | depends on AX25 |
21 | ---help--- | 21 | ---help--- |
22 | 6pack is a transmission protocol for the data exchange between your | 22 | 6pack is a transmission protocol for the data exchange between your |
23 | PC and your TNC (the Terminal Node Controller acts as a kind of | 23 | PC and your TNC (the Terminal Node Controller acts as a kind of |