diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-25 03:40:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-25 03:40:26 -0500 |
| commit | 996de8c6fe95c5a9fc524241cc8f142ef0605d3d (patch) | |
| tree | 0f637ab0d80d6d7e213707ac2d8c1cc16b69523c /drivers/net/ks8851_mll.c | |
| parent | 017c426138122c8e9b9f5057fbd0567c37b35247 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge commit 'v2.6.33' into core/rcu
Merge reason: Update from -rc4 to -final.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/ks8851_mll.c')
| -rw-r--r-- | drivers/net/ks8851_mll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index c146304d8d6c..c0ceebccaa49 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c | |||
| @@ -854,8 +854,8 @@ static void ks_update_link_status(struct net_device *netdev, struct ks_net *ks) | |||
| 854 | 854 | ||
| 855 | static irqreturn_t ks_irq(int irq, void *pw) | 855 | static irqreturn_t ks_irq(int irq, void *pw) |
| 856 | { | 856 | { |
| 857 | struct ks_net *ks = pw; | 857 | struct net_device *netdev = pw; |
| 858 | struct net_device *netdev = ks->netdev; | 858 | struct ks_net *ks = netdev_priv(netdev); |
| 859 | u16 status; | 859 | u16 status; |
| 860 | 860 | ||
| 861 | /*this should be the first in IRQ handler */ | 861 | /*this should be the first in IRQ handler */ |