diff options
| author | Len Brown <len.brown@intel.com> | 2012-06-04 06:35:19 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-06-04 06:35:19 +0200 |
| commit | 7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a (patch) | |
| tree | 65c5898ba93007d4399150c7a127a670bcfbc30d /drivers/net/cris/eth_v10.c | |
| parent | ACPI video: use after input_unregister_device() (diff) | |
| parent | Linux 3.5-rc1 (diff) | |
| download | linux-7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a.tar.xz linux-7e1bd6e38b1f30860ce25a014c6d6adfb0079f4a.zip | |
Merge branch 'upstream' into bugfix-video
Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.
Conflicts:
drivers/gpu/drm/gma500/psb_drv.c
text conflict: add comment vs delete neighboring line
keep just this:
/* igd_opregion_init(&dev_priv->opregion_dev); */
/* acpi_video_register(); */
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/net/cris/eth_v10.c')
| -rw-r--r-- | drivers/net/cris/eth_v10.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index ec03b401620a..9c755db6b16d 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c @@ -1131,7 +1131,6 @@ static irqreturn_t e100rxtx_interrupt(int irq, void *dev_id) { struct net_device *dev = (struct net_device *)dev_id; - struct net_local *np = netdev_priv(dev); unsigned long irqbits; /* |