diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /net/decnet/Kconfig | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/decnet/Kconfig')
| -rw-r--r-- | net/decnet/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/decnet/Kconfig b/net/decnet/Kconfig index 36e72cb145b0..7914fd619c5c 100644 --- a/net/decnet/Kconfig +++ b/net/decnet/Kconfig | |||
| @@ -41,11 +41,3 @@ config DECNET_ROUTER | |||
| 41 | 41 | ||
| 42 | See <file:Documentation/networking/decnet.txt> for more information. | 42 | See <file:Documentation/networking/decnet.txt> for more information. |
| 43 | 43 | ||
| 44 | config DECNET_ROUTE_FWMARK | ||
| 45 | bool "DECnet: use FWMARK value as routing key (EXPERIMENTAL)" | ||
| 46 | depends on DECNET_ROUTER && NETFILTER | ||
| 47 | help | ||
| 48 | If you say Y here, you will be able to specify different routes for | ||
| 49 | packets with different FWMARK ("firewalling mark") values | ||
| 50 | (see ipchains(8), "-m" argument). | ||
| 51 | |||