Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194599
b: refs/heads/master
c: c28884c
h: refs/heads/master
i:
  194597: 280b292
  194595: 2587df4
  194591: f29f78f
v: v3
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Apr 28, 2010
1 parent 057f7fe commit 5e60196
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3d07df11c4be368681c0b8228c3d80eeb1fcfabd
refs/heads/master: c28884c57400de326ba4c1ff9608f1d425bdd0fd
3 changes: 2 additions & 1 deletion trunk/drivers/net/sfc/net_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ union efx_multicast_hash {
* This register is written with the SMP processor ID whenever an
* interrupt is handled. It is used by efx_nic_test_interrupt()
* to verify that an interrupt has occurred.
* @irq_zero_count: Number of legacy IRQs seen with queue flags == 0
* @fatal_irq_level: IRQ level (bit number) used for serious errors
* @spi_flash: SPI flash device
* This field will be %NULL if no flash device is present (or for Siena).
Expand Down Expand Up @@ -756,7 +757,7 @@ struct efx_nic {

struct efx_buffer irq_status;
volatile signed int last_irq_cpu;
unsigned long irq_zero_count;
unsigned irq_zero_count;
unsigned fatal_irq_level;

struct efx_spi_device *spi_flash;
Expand Down

0 comments on commit 5e60196

Please sign in to comment.