diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
| commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
| tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /drivers/net/sunhme.c | |
| parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
| parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (diff) | |
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
Diffstat (limited to 'drivers/net/sunhme.c')
| -rw-r--r-- | drivers/net/sunhme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 45d07faf7b96..9d7cd130c19d 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
| @@ -2095,8 +2095,8 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev) | |||
| 2095 | 2095 | ||
| 2096 | static irqreturn_t happy_meal_interrupt(int irq, void *dev_id) | 2096 | static irqreturn_t happy_meal_interrupt(int irq, void *dev_id) |
| 2097 | { | 2097 | { |
| 2098 | struct net_device *dev = (struct net_device *) dev_id; | 2098 | struct net_device *dev = dev_id; |
| 2099 | struct happy_meal *hp = dev->priv; | 2099 | struct happy_meal *hp = netdev_priv(dev); |
| 2100 | u32 happy_status = hme_read32(hp, hp->gregs + GREG_STAT); | 2100 | u32 happy_status = hme_read32(hp, hp->gregs + GREG_STAT); |
| 2101 | 2101 | ||
| 2102 | HMD(("happy_meal_interrupt: status=%08x ", happy_status)); | 2102 | HMD(("happy_meal_interrupt: status=%08x ", happy_status)); |