diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 13:44:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 13:44:25 -0700 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/isdn/hysdn | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
| download | linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.tar.gz linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.tar.bz2 linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/isdn/hysdn')
| -rw-r--r-- | drivers/isdn/hysdn/hysdn_sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c index 81db4a190d41..3674d30d6a03 100644 --- a/drivers/isdn/hysdn/hysdn_sched.c +++ b/drivers/isdn/hysdn/hysdn_sched.c @@ -143,7 +143,7 @@ hysdn_sched_tx(hysdn_card *card, unsigned char *buf, /* send one config line to the card and return 0 if successful, otherwise a */ /* negative error code. */ /* The function works with timeouts perhaps not giving the greatest speed */ -/* sending the line, but this should be meaningless beacuse only some lines */ +/* sending the line, but this should be meaningless because only some lines */ /* are to be sent and this happens very seldom. */ /*****************************************************************************/ int |