git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
[pandora-kernel.git]
/
drivers
/
net
/
sky2.h
diff --git
a/drivers/net/sky2.h
b/drivers/net/sky2.h
index
dce4d27
..
72e12b7
100644
(file)
--- a/
drivers/net/sky2.h
+++ b/
drivers/net/sky2.h
@@
-2045,12
+2045,13
@@
struct sky2_hw {
u8 chip_rev;
u8 pmd_type;
u8 ports;
+ u8 active;
struct sky2_status_le *st_le;
u32 st_idx;
dma_addr_t st_dma;
- struct timer_list
idle
_timer;
+ struct timer_list
watchdog
_timer;
struct work_struct restart_work;
int msi;
wait_queue_head_t msi_wait;