diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /drivers/net/wan | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/Config.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wan/Config.in b/drivers/net/wan/Config.in index e0a6f5e8f..4ffe0730f 100644 --- a/drivers/net/wan/Config.in +++ b/drivers/net/wan/Config.in @@ -55,9 +55,11 @@ if [ "$CONFIG_WAN" = "y" ]; then if [ "$CONFIG_VENDOR_SANGOMA" != "n" ]; then int ' Maximum number of cards' CONFIG_WANPIPE_CARDS 1 bool ' WANPIPE Cisco HDLC support' CONFIG_WANPIPE_CHDLC - bool ' WANPIPE Frame Relay support' CONFIG_WANPIPE_FR + if [ "$CONFIG_OBSOLETE" = "y" ]; then + bool ' WANPIPE Frame Relay support' CONFIG_WANPIPE_FR + bool ' WANPIPE X.25 support' CONFIG_WANPIPE_X25 + fi bool ' WANPIPE PPP support' CONFIG_WANPIPE_PPP - bool ' WANPIPE X.25 support' CONFIG_WANPIPE_X25 fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Cyclom 2X(tm) cards (EXPERIMENTAL)' CONFIG_CYCLADES_SYNC $CONFIG_WAN_ROUTER_DRIVERS |