diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wan/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wan/Kconfig')
| -rw-r--r-- | drivers/net/wan/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig index d08ce6a264cb..423eb26386c8 100644 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig | |||
| @@ -409,7 +409,7 @@ config CYCLADES_SYNC | |||
| 409 | tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)" | 409 | tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)" |
| 410 | depends on WAN_ROUTER_DRIVERS && (PCI || ISA) | 410 | depends on WAN_ROUTER_DRIVERS && (PCI || ISA) |
| 411 | ---help--- | 411 | ---help--- |
| 412 | Cyclom 2X from Cyclades Corporation <http://www.cyclades.com/> is an | 412 | Cyclom 2X from Cyclades Corporation <http://www.avocent.com/> is an |
| 413 | intelligent multiprotocol WAN adapter with data transfer rates up to | 413 | intelligent multiprotocol WAN adapter with data transfer rates up to |
| 414 | 512 Kbps. These cards support the X.25 and SNA related protocols. | 414 | 512 Kbps. These cards support the X.25 and SNA related protocols. |
| 415 | 415 | ||