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/hamradio/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/hamradio/Kconfig')
| -rw-r--r-- | drivers/net/hamradio/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 62d5d5cfd6a6..95dbcfdf131d 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
| @@ -73,7 +73,7 @@ config DMASCC | |||
| 73 | certain parameters, such as channel access timing, clock mode, and | 73 | certain parameters, such as channel access timing, clock mode, and |
| 74 | DMA channel. This is accomplished with a small utility program, | 74 | DMA channel. This is accomplished with a small utility program, |
| 75 | dmascc_cfg, available at | 75 | dmascc_cfg, available at |
| 76 | <http://cacofonix.nt.tuwien.ac.at/~oe1kib/Linux/>. Please be sure to | 76 | <http://www.linux-ax25.org/wiki/Ax25-tools>. Please be sure to |
| 77 | get at least version 1.27 of dmascc_cfg, as older versions will not | 77 | get at least version 1.27 of dmascc_cfg, as older versions will not |
| 78 | work with the current driver. | 78 | work with the current driver. |
| 79 | 79 | ||