[lkml]   [2013]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the driver-core tree with the net-next tree
Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in drivers/net/wan/Kconfig between commit a786a7c0ad44 ("wanrouter: completely decouple obsolete code from kernel") from the net-next tree and commit c9f1b39aee74 ("drivers/net/wan: remove depends on CONFIG_EXPERIMENTAL") from the driver-core tree.

The former removed part of the text changed by the latter, so I just did
that (see below) and can carry the fix as necessary (no action is

Stephen Rothwell

diff --cc drivers/net/wan/Kconfig
index 0c077b0,c0cd88d..0000000
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@@ -356,9 -356,63 +356,9 @@@ config SDL
To compile this driver as a module, choose M here: the
module will be called sdla.

-# Wan router core.
- tristate "WAN router drivers"
- depends on WAN_ROUTER
- ---help---
- Connect LAN to WAN via Linux box.
- Select driver your card and remember to say Y to "Wan Router."
- You will need the wan-tools package which is available from
- <>.
- Note that the answer to this question won't directly affect the
- kernel except for how subordinate drivers may be built:
- saying N will just cause the configurator to skip all
- the questions about WAN router drivers.
- If unsure, say N.
- tristate "Cyclom 2X(tm) cards"
- depends on WAN_ROUTER_DRIVERS && (PCI || ISA)
- ---help---
- Cyclom 2X from Cyclades Corporation <> is an
- intelligent multiprotocol WAN adapter with data transfer rates up to
- 512 Kbps. These cards support the X.25 and SNA related protocols.
- While no documentation is available at this time please grab the
- wanconfig tarball in
- <> (with minor changes
- to make it compile with the current wanrouter include files; efforts
- are being made to use the original package available at
- <>).
- Feel free to contact me or the cycsyn-devel mailing list at
- <> and <> for
- additional details, I hope to have documentation available as soon as
- possible. (Cyclades Brazil is writing the Documentation).
- The next questions will ask you about the protocols you want the
- driver to support (for now only X.25 is supported).
- If you have one or more of these cards, say Y to this option.
- To compile this driver as a module, choose M here: the
- module will be called cyclomx.
-config CYCLOMX_X25
- bool "Cyclom 2X X.25 support"
- depends on CYCLADES_SYNC
- help
- Connect a Cyclom 2X card to an X.25 network.
- Enabling X.25 support will enlarge your kernel by about 11 kB.
# X.25 network drivers
- tristate "LAPB over Ethernet driver (EXPERIMENTAL)"
+ tristate "LAPB over Ethernet driver"
depends on LAPB && X25
Driver for a pseudo device (typically called /dev/lapb0) which allows
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2013-02-04 06:21    [W:0.027 / U:0.852 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site