diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
| commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
| tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /drivers/net/spider_net.c | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 477671606273..00aa0b108cb9 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -1704,7 +1704,7 @@ spider_net_poll_controller(struct net_device *netdev) | |||
| 1704 | * | 1704 | * |
| 1705 | * spider_net_enable_interrupt enables several interrupts | 1705 | * spider_net_enable_interrupt enables several interrupts |
| 1706 | */ | 1706 | */ |
| 1707 | static void | 1707 | static void |
| 1708 | spider_net_enable_interrupts(struct spider_net_card *card) | 1708 | spider_net_enable_interrupts(struct spider_net_card *card) |
| 1709 | { | 1709 | { |
| 1710 | spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, | 1710 | spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, |
| @@ -1721,7 +1721,7 @@ spider_net_enable_interrupts(struct spider_net_card *card) | |||
| 1721 | * | 1721 | * |
| 1722 | * spider_net_disable_interrupts disables all the interrupts | 1722 | * spider_net_disable_interrupts disables all the interrupts |
| 1723 | */ | 1723 | */ |
| 1724 | static void | 1724 | static void |
| 1725 | spider_net_disable_interrupts(struct spider_net_card *card) | 1725 | spider_net_disable_interrupts(struct spider_net_card *card) |
| 1726 | { | 1726 | { |
| 1727 | spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, 0); | 1727 | spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, 0); |