diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /drivers/net/wan | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/pc300_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index f875cfae3093..737b59f1a8dc 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
| @@ -1445,7 +1445,7 @@ static void falc_update_stats(pc300_t * card, int ch) | |||
| 1445 | * Description: In the remote loopback mode the clock and data recovered | 1445 | * Description: In the remote loopback mode the clock and data recovered |
| 1446 | * from the line inputs RL1/2 or RDIP/RDIN are routed back | 1446 | * from the line inputs RL1/2 or RDIP/RDIN are routed back |
| 1447 | * to the line outputs XL1/2 or XDOP/XDON via the analog | 1447 | * to the line outputs XL1/2 or XDOP/XDON via the analog |
| 1448 | * transmitter. As in normal mode they are processsed by | 1448 | * transmitter. As in normal mode they are processed by |
| 1449 | * the synchronizer and then sent to the system interface. | 1449 | * the synchronizer and then sent to the system interface. |
| 1450 | *---------------------------------------------------------------------------- | 1450 | *---------------------------------------------------------------------------- |
| 1451 | */ | 1451 | */ |