diff options
Diffstat (limited to 'include/linux/arcdevice.h')
-rw-r--r-- | include/linux/arcdevice.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h index 7216b0daf544..df0356220730 100644 --- a/include/linux/arcdevice.h +++ b/include/linux/arcdevice.h | |||
@@ -22,10 +22,6 @@ | |||
22 | #ifdef __KERNEL__ | 22 | #ifdef __KERNEL__ |
23 | #include <linux/irqreturn.h> | 23 | #include <linux/irqreturn.h> |
24 | 24 | ||
25 | #ifndef bool | ||
26 | #define bool int | ||
27 | #endif | ||
28 | |||
29 | /* | 25 | /* |
30 | * RECON_THRESHOLD is the maximum number of RECON messages to receive | 26 | * RECON_THRESHOLD is the maximum number of RECON messages to receive |
31 | * within one minute before printing a "cabling problem" warning. The | 27 | * within one minute before printing a "cabling problem" warning. The |
@@ -285,9 +281,9 @@ struct arcnet_local { | |||
285 | unsigned long first_recon; /* time of "first" RECON message to count */ | 281 | unsigned long first_recon; /* time of "first" RECON message to count */ |
286 | unsigned long last_recon; /* time of most recent RECON */ | 282 | unsigned long last_recon; /* time of most recent RECON */ |
287 | int num_recons; /* number of RECONs between first and last. */ | 283 | int num_recons; /* number of RECONs between first and last. */ |
288 | bool network_down; /* do we think the network is down? */ | 284 | int network_down; /* do we think the network is down? */ |
289 | 285 | ||
290 | bool excnak_pending; /* We just got an excesive nak interrupt */ | 286 | int excnak_pending; /* We just got an excesive nak interrupt */ |
291 | 287 | ||
292 | struct { | 288 | struct { |
293 | uint16_t sequence; /* sequence number (incs with each packet) */ | 289 | uint16_t sequence; /* sequence number (incs with each packet) */ |
@@ -305,7 +301,7 @@ struct arcnet_local { | |||
305 | void (*command) (struct net_device * dev, int cmd); | 301 | void (*command) (struct net_device * dev, int cmd); |
306 | int (*status) (struct net_device * dev); | 302 | int (*status) (struct net_device * dev); |
307 | void (*intmask) (struct net_device * dev, int mask); | 303 | void (*intmask) (struct net_device * dev, int mask); |
308 | bool (*reset) (struct net_device * dev, bool really_reset); | 304 | int (*reset) (struct net_device * dev, int really_reset); |
309 | void (*open) (struct net_device * dev); | 305 | void (*open) (struct net_device * dev); |
310 | void (*close) (struct net_device * dev); | 306 | void (*close) (struct net_device * dev); |
311 | 307 | ||