diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-25 08:30:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-25 08:30:35 -0700 |
| commit | 4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85 (patch) | |
| tree | 99cc41c06ade46f9925268728417c9529ce5041e /drivers/net | |
| parent | 92bf3d09410531a06e06504957271e3978f937e2 (diff) | |
| parent | 7b91747d42a1012e3781dd09fa638d113809e3fd (diff) | |
| download | blackbird-op-linux-4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85.tar.gz blackbird-op-linux-4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85.zip | |
Merge tag 'cris-for-linus' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson:
"No major changes here, but fixes some compile errors for CRIS, some
small style issues, some documentation and as a bonus nukes a couple
of obsolete rtc-files and related code."
* tag 'cris-for-linus' of git://jni.nu/cris:
cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile
CRIS: Remove legacy RTC drivers
cris/mm/fault.c: Port OOM changes to do_page_fault
cris:fix the wrong function declear
CRIS: Add _sdata to vmlinux.lds.S
cris: posix_types.h, include asm-generic/posix_types.h
CRIS: Update documentation
cris/arch-v32: cryptocop: Use kzalloc
net:removed the unused variable
cris:removed the unused variable
CRISv32: Correct name of read_mostly section.
Diffstat (limited to 'drivers/net')
| -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; /* |
