From 5d0e1362ca5522efbb9fa0b4335da34a2d953da8 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 12 Jul 2011 10:13:24 +0000 Subject: [PATCH] --- yaml --- r: 256303 b: refs/heads/master c: e3001c98df51d81a72534837d8069bfb53f3e1ea h: refs/heads/master i: 256301: 179cecfe50c867f32d6839244c1641e1cde1c4df 256299: 4071dbef6be639a80b4101024ef7f3a1320e0bb9 256295: 6c19adc9bd75dcdea5b66057ac60f5bf0f536661 256287: 08583307f90338a0d5a8f542048462a3a996336f v: v3 --- [refs] | 2 +- trunk/drivers/net/ps3_gelic_net.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c372e5908708..e1a5226723c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40522998dec20d970fe6f0ea8507004aef18f72d +refs/heads/master: e3001c98df51d81a72534837d8069bfb53f3e1ea diff --git a/trunk/drivers/net/ps3_gelic_net.c b/trunk/drivers/net/ps3_gelic_net.c index 35e47c3cab35..9652d10b0159 100644 --- a/trunk/drivers/net/ps3_gelic_net.c +++ b/trunk/drivers/net/ps3_gelic_net.c @@ -876,7 +876,7 @@ int gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev) result = gelic_descr_prepare_tx(card, descr, skb); if (result) { /* - * DMA map failed. As chanses are that failure + * DMA map failed. As chances are that failure * would continue, just release skb and return */ netdev->stats.tx_dropped++; @@ -1041,7 +1041,7 @@ static int gelic_card_decode_one_descr(struct gelic_card *card) goto refill; } /* - * descriptoers any other than FRAME_END here should + * descriptors any other than FRAME_END here should * be treated as error. */ if (status != GELIC_DESCR_DMA_FRAME_END) { @@ -1200,7 +1200,7 @@ void gelic_net_poll_controller(struct net_device *netdev) #endif /* CONFIG_NET_POLL_CONTROLLER */ /** - * gelic_net_open - called upon ifonfig up + * gelic_net_open - called upon ifconfig up * @netdev: interface device structure * * returns 0 on success, <0 on failure