diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 10:22:29 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 10:22:29 +0200 |
| commit | b79b3e05b1229d5b2fc2af71dc29701642577eba (patch) | |
| tree | bcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /drivers/net/ps3_gelic_net.h | |
| parent | ARM: static should be at beginning of declaration (diff) | |
| parent | ARM: mach-shmobile: ag5evm: SDHI requires waiting for idle (diff) | |
| download | linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.xz linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.zip | |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'drivers/net/ps3_gelic_net.h')
| -rw-r--r-- | drivers/net/ps3_gelic_net.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h index d9a55b93898b..d3fadfbc3bcc 100644 --- a/drivers/net/ps3_gelic_net.h +++ b/drivers/net/ps3_gelic_net.h @@ -289,7 +289,6 @@ struct gelic_card { struct gelic_descr_chain tx_chain; struct gelic_descr_chain rx_chain; - int rx_dma_restart_required; /* * tx_lock guards tx descriptor list and * tx_dma_progress. |