diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /drivers/net/arlan.h | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'drivers/net/arlan.h')
| -rw-r--r-- | drivers/net/arlan.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/arlan.h b/drivers/net/arlan.h index e28982bdb..0f3d5da3e 100644 --- a/drivers/net/arlan.h +++ b/drivers/net/arlan.h @@ -388,7 +388,7 @@ struct arlan_private { volatile int tx_chain_active; volatile int timer_chain_active; volatile int interrupt_ack_requested; - volatile int command_lock; + volatile long command_lock; volatile int rx_command_needed; volatile int tx_command_needed; volatile int waiting_command_mask; @@ -398,8 +398,8 @@ struct arlan_private { volatile int under_reset; volatile int under_config; volatile int rx_command_given; - volatile int tx_command_given; - volatile int interrupt_processing_active; + volatile long tx_command_given; + volatile long interrupt_processing_active; volatile long long last_tx_time; volatile long long last_rx_time; volatile long long last_rx_int_ack_time; |