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/ps3_gelic_net.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/ps3_gelic_net.c')
| -rw-r--r-- | drivers/net/ps3_gelic_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 5ecfa4b1e75..ffdf7349ef7 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
| @@ -632,7 +632,7 @@ static inline void gelic_card_enable_rxdmac(struct gelic_card *card) | |||
| 632 | * @card: card structure | 632 | * @card: card structure |
| 633 | * | 633 | * |
| 634 | * gelic_card_disable_rxdmac terminates processing on the DMA controller by | 634 | * gelic_card_disable_rxdmac terminates processing on the DMA controller by |
| 635 | * turing off DMA and issueing a force end | 635 | * turing off DMA and issuing a force end |
| 636 | */ | 636 | */ |
| 637 | static inline void gelic_card_disable_rxdmac(struct gelic_card *card) | 637 | static inline void gelic_card_disable_rxdmac(struct gelic_card *card) |
| 638 | { | 638 | { |
| @@ -650,7 +650,7 @@ static inline void gelic_card_disable_rxdmac(struct gelic_card *card) | |||
| 650 | * @card: card structure | 650 | * @card: card structure |
| 651 | * | 651 | * |
| 652 | * gelic_card_disable_txdmac terminates processing on the DMA controller by | 652 | * gelic_card_disable_txdmac terminates processing on the DMA controller by |
| 653 | * turing off DMA and issueing a force end | 653 | * turing off DMA and issuing a force end |
| 654 | */ | 654 | */ |
| 655 | static inline void gelic_card_disable_txdmac(struct gelic_card *card) | 655 | static inline void gelic_card_disable_txdmac(struct gelic_card *card) |
| 656 | { | 656 | { |