summaryrefslogtreecommitdiffstats
path: root/net/atm/Kconfig
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-07-26 09:55:10 -0500
committerDave Kleikamp <shaggy@austin.ibm.com>2005-07-26 09:55:10 -0500
commitde8fd087b280797977b012a4275ee53ff2999f3f (patch)
tree5cd65289983ad65812a6a4335fe657eeb125a7f0 /net/atm/Kconfig
parent18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8 (diff)
parent6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff)
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'net/atm/Kconfig')
-rw-r--r--net/atm/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/atm/Kconfig b/net/atm/Kconfig
index bea2426229b..21ff276b2d8 100644
--- a/net/atm/Kconfig
+++ b/net/atm/Kconfig
@@ -60,7 +60,7 @@ config ATM_BR2684
tristate "RFC1483/2684 Bridged protocols"
depends on ATM && INET
help
- ATM PVCs can carry ethernet PDUs according to rfc2684 (formerly 1483)
+ ATM PVCs can carry ethernet PDUs according to RFC2684 (formerly 1483)
This device will act like an ethernet from the kernels point of view,
with the traffic being carried by ATM PVCs (currently 1 PVC/device).
This is sometimes used over DSL lines. If in doubt, say N.
@@ -69,6 +69,6 @@ config ATM_BR2684_IPFILTER
bool "Per-VC IP filter kludge"
depends on ATM_BR2684
help
- This is an experimental mechanism for users who need to terminating a
+ This is an experimental mechanism for users who need to terminate a
large number of IP-only vcc's. Do not enable this unless you are sure
you know what you are doing.