diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/usb/cdc_eem.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
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/net/usb/cdc_eem.c')
| -rw-r--r-- | drivers/net/usb/cdc_eem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c index 8f128541656..882f53f708d 100644 --- a/drivers/net/usb/cdc_eem.c +++ b/drivers/net/usb/cdc_eem.c | |||
| @@ -190,7 +190,7 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | |||
| 190 | 190 | ||
| 191 | /* | 191 | /* |
| 192 | * EEM packet header format: | 192 | * EEM packet header format: |
| 193 | * b0..14: EEM type dependant (Data or Command) | 193 | * b0..14: EEM type dependent (Data or Command) |
| 194 | * b15: bmType | 194 | * b15: bmType |
| 195 | */ | 195 | */ |
| 196 | header = get_unaligned_le16(skb->data); | 196 | header = get_unaligned_le16(skb->data); |