diff options
author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-24 06:03:52 +0400 |
---|---|---|
committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-24 06:03:52 +0400 |
commit | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (patch) | |
tree | d91083e3079f1ddb942a382ac2b5a7525570ad59 /net/decnet/Kconfig | |
parent | dfdc58ba354adb80d67c99f7be84f95a8e02e466 (diff) | |
parent | 1ab9dd0902df4f4ff56fbf672220549090ab28ba (diff) | |
download | linux-1aedf2ccc60fade26c46fae12e28664d0da3f199.tar.xz |
Merge mulgrave-w:git/linux-2.6
Conflicts:
include/linux/blkdev.h
Trivial merge to incorporate tag prototypes.
Diffstat (limited to 'net/decnet/Kconfig')
-rw-r--r-- | net/decnet/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/decnet/Kconfig b/net/decnet/Kconfig index 92f2ec46fd22..36e72cb145b0 100644 --- a/net/decnet/Kconfig +++ b/net/decnet/Kconfig @@ -27,6 +27,7 @@ config DECNET config DECNET_ROUTER bool "DECnet: router support (EXPERIMENTAL)" depends on DECNET && EXPERIMENTAL + select FIB_RULES ---help--- Add support for turning your DECnet Endnode into a level 1 or 2 router. This is an experimental, but functional option. If you |