diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/atm/ambassador.h | 2 | ||||
-rw-r--r-- | drivers/atm/horizon.h | 2 | ||||
-rw-r--r-- | drivers/char/dsp56k.c | 2 | ||||
-rw-r--r-- | drivers/char/rio/host.h | 2 | ||||
-rw-r--r-- | drivers/char/riscom8.h | 2 | ||||
-rw-r--r-- | drivers/char/sx.h | 4 | ||||
-rw-r--r-- | drivers/fc4/fcp_impl.h | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/hisax.h | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/hisax_if.h | 2 | ||||
-rw-r--r-- | drivers/net/ni65.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/cosa.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_wlan.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ray_cs.h | 4 |
13 files changed, 16 insertions, 16 deletions
diff --git a/drivers/atm/ambassador.h b/drivers/atm/ambassador.h index 8296420ceaef..ff2a303cbe00 100644 --- a/drivers/atm/ambassador.h +++ b/drivers/atm/ambassador.h | |||
@@ -626,7 +626,7 @@ typedef struct { | |||
626 | 626 | ||
627 | struct amb_dev { | 627 | struct amb_dev { |
628 | u8 irq; | 628 | u8 irq; |
629 | long flags; | 629 | unsigned long flags; |
630 | u32 iobase; | 630 | u32 iobase; |
631 | u32 * membase; | 631 | u32 * membase; |
632 | 632 | ||
diff --git a/drivers/atm/horizon.h b/drivers/atm/horizon.h index 4461229f56a5..b48859d0d434 100644 --- a/drivers/atm/horizon.h +++ b/drivers/atm/horizon.h | |||
@@ -423,7 +423,7 @@ struct hrz_dev { | |||
423 | wait_queue_head_t tx_queue; | 423 | wait_queue_head_t tx_queue; |
424 | 424 | ||
425 | u8 irq; | 425 | u8 irq; |
426 | long flags; | 426 | unsigned long flags; |
427 | u8 tx_last; | 427 | u8 tx_last; |
428 | u8 tx_idle; | 428 | u8 tx_idle; |
429 | 429 | ||
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c index acbfe1c49b4d..a69c65283260 100644 --- a/drivers/char/dsp56k.c +++ b/drivers/char/dsp56k.c | |||
@@ -136,7 +136,7 @@ static int sizeof_bootstrap = 375; | |||
136 | 136 | ||
137 | 137 | ||
138 | static struct dsp56k_device { | 138 | static struct dsp56k_device { |
139 | long in_use; | 139 | unsigned long in_use; |
140 | long maxio, timeout; | 140 | long maxio, timeout; |
141 | int tx_wsize, rx_wsize; | 141 | int tx_wsize, rx_wsize; |
142 | } dsp56k; | 142 | } dsp56k; |
diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h index 23d0681fe491..78f24540c224 100644 --- a/drivers/char/rio/host.h +++ b/drivers/char/rio/host.h | |||
@@ -99,7 +99,7 @@ struct Host { | |||
99 | struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT]; | 99 | struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT]; |
100 | int timeout_id; /* For calling 100 ms delays */ | 100 | int timeout_id; /* For calling 100 ms delays */ |
101 | int timeout_sem; /* For calling 100 ms delays */ | 101 | int timeout_sem; /* For calling 100 ms delays */ |
102 | long locks; /* long req'd for set_bit --RR */ | 102 | unsigned long locks; /* long req'd for set_bit --RR */ |
103 | char ____end_marker____; | 103 | char ____end_marker____; |
104 | }; | 104 | }; |
105 | #define Control CardP->DpControl | 105 | #define Control CardP->DpControl |
diff --git a/drivers/char/riscom8.h b/drivers/char/riscom8.h index 6317aade201a..9cc1313d5e67 100644 --- a/drivers/char/riscom8.h +++ b/drivers/char/riscom8.h | |||
@@ -71,7 +71,7 @@ struct riscom_port { | |||
71 | struct tty_struct * tty; | 71 | struct tty_struct * tty; |
72 | int count; | 72 | int count; |
73 | int blocked_open; | 73 | int blocked_open; |
74 | long event; /* long req'd for set_bit --RR */ | 74 | unsigned long event; /* long req'd for set_bit --RR */ |
75 | int timeout; | 75 | int timeout; |
76 | int close_delay; | 76 | int close_delay; |
77 | unsigned char * xmit_buf; | 77 | unsigned char * xmit_buf; |
diff --git a/drivers/char/sx.h b/drivers/char/sx.h index 432aad0a2ddd..70d9783c7323 100644 --- a/drivers/char/sx.h +++ b/drivers/char/sx.h | |||
@@ -27,7 +27,7 @@ struct sx_port { | |||
27 | int c_dcd; | 27 | int c_dcd; |
28 | struct sx_board *board; | 28 | struct sx_board *board; |
29 | int line; | 29 | int line; |
30 | long locks; | 30 | unsigned long locks; |
31 | }; | 31 | }; |
32 | 32 | ||
33 | struct sx_board { | 33 | struct sx_board { |
@@ -45,7 +45,7 @@ struct sx_board { | |||
45 | int poll; | 45 | int poll; |
46 | int ta_type; | 46 | int ta_type; |
47 | struct timer_list timer; | 47 | struct timer_list timer; |
48 | long locks; | 48 | unsigned long locks; |
49 | }; | 49 | }; |
50 | 50 | ||
51 | struct vpd_prom { | 51 | struct vpd_prom { |
diff --git a/drivers/fc4/fcp_impl.h b/drivers/fc4/fcp_impl.h index 1ac61330592e..506338a461ba 100644 --- a/drivers/fc4/fcp_impl.h +++ b/drivers/fc4/fcp_impl.h | |||
@@ -91,7 +91,7 @@ typedef struct _fc_channel { | |||
91 | fcp_cmd *scsi_cmd_pool; | 91 | fcp_cmd *scsi_cmd_pool; |
92 | char *scsi_rsp_pool; | 92 | char *scsi_rsp_pool; |
93 | dma_addr_t dma_scsi_cmd, dma_scsi_rsp; | 93 | dma_addr_t dma_scsi_cmd, dma_scsi_rsp; |
94 | long *scsi_bitmap; | 94 | unsigned long *scsi_bitmap; |
95 | long scsi_bitmap_end; | 95 | long scsi_bitmap_end; |
96 | int scsi_free; | 96 | int scsi_free; |
97 | int (*encode_addr)(struct scsi_cmnd *, u16 *, struct _fc_channel *, fcp_cmnd *); | 97 | int (*encode_addr)(struct scsi_cmnd *, u16 *, struct _fc_channel *, fcp_cmnd *); |
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 3cd8d5ba239b..34733c903df7 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h | |||
@@ -202,7 +202,7 @@ struct Layer1 { | |||
202 | void *hardware; | 202 | void *hardware; |
203 | struct BCState *bcs; | 203 | struct BCState *bcs; |
204 | struct PStack **stlistp; | 204 | struct PStack **stlistp; |
205 | long Flags; | 205 | unsigned long Flags; |
206 | struct FsmInst l1m; | 206 | struct FsmInst l1m; |
207 | struct FsmTimer timer; | 207 | struct FsmTimer timer; |
208 | void (*l1l2) (struct PStack *, int, void *); | 208 | void (*l1l2) (struct PStack *, int, void *); |
diff --git a/drivers/isdn/hisax/hisax_if.h b/drivers/isdn/hisax/hisax_if.h index 4898fce2d509..aa7c94037b2b 100644 --- a/drivers/isdn/hisax/hisax_if.h +++ b/drivers/isdn/hisax/hisax_if.h | |||
@@ -56,7 +56,7 @@ struct hisax_d_if { | |||
56 | struct IsdnCardState *cs; | 56 | struct IsdnCardState *cs; |
57 | struct hisax_b_if *b_if[2]; | 57 | struct hisax_b_if *b_if[2]; |
58 | struct sk_buff_head erq; | 58 | struct sk_buff_head erq; |
59 | long ph_state; | 59 | unsigned long ph_state; |
60 | }; | 60 | }; |
61 | 61 | ||
62 | int hisax_register(struct hisax_d_if *hisax_if, struct hisax_b_if *b_if[], | 62 | int hisax_register(struct hisax_d_if *hisax_if, struct hisax_b_if *b_if[], |
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c index 097685245112..3edc971d0eca 100644 --- a/drivers/net/ni65.c +++ b/drivers/net/ni65.c | |||
@@ -183,7 +183,7 @@ static struct card { | |||
183 | short addr_offset; | 183 | short addr_offset; |
184 | unsigned char *vendor_id; | 184 | unsigned char *vendor_id; |
185 | char *cardname; | 185 | char *cardname; |
186 | long config; | 186 | unsigned long config; |
187 | } cards[] = { | 187 | } cards[] = { |
188 | { | 188 | { |
189 | .id0 = NI65_ID0, | 189 | .id0 = NI65_ID0, |
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 26058b4f8f36..ff37bf437a99 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
@@ -154,8 +154,8 @@ struct cosa_data { | |||
154 | int nchannels; /* # of channels on this card */ | 154 | int nchannels; /* # of channels on this card */ |
155 | int driver_status; /* For communicating with firmware */ | 155 | int driver_status; /* For communicating with firmware */ |
156 | int firmware_status; /* Downloaded, reseted, etc. */ | 156 | int firmware_status; /* Downloaded, reseted, etc. */ |
157 | long int rxbitmap, txbitmap; /* Bitmap of channels who are willing to send/receive data */ | 157 | unsigned long rxbitmap, txbitmap;/* Bitmap of channels who are willing to send/receive data */ |
158 | long int rxtx; /* RX or TX in progress? */ | 158 | unsigned long rxtx; /* RX or TX in progress? */ |
159 | int enabled; | 159 | int enabled; |
160 | int usage; /* usage count */ | 160 | int usage; /* usage count */ |
161 | int txchan, txsize, rxsize; | 161 | int txchan, txsize, rxsize; |
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h index c27b2c1c06af..e6516a186d0e 100644 --- a/drivers/net/wireless/hostap/hostap_wlan.h +++ b/drivers/net/wireless/hostap/hostap_wlan.h | |||
@@ -661,7 +661,7 @@ struct local_info { | |||
661 | #define HOSTAP_BITS_TRANSMIT 0 | 661 | #define HOSTAP_BITS_TRANSMIT 0 |
662 | #define HOSTAP_BITS_BAP_TASKLET 1 | 662 | #define HOSTAP_BITS_BAP_TASKLET 1 |
663 | #define HOSTAP_BITS_BAP_TASKLET2 2 | 663 | #define HOSTAP_BITS_BAP_TASKLET2 2 |
664 | long bits; | 664 | unsigned long bits; |
665 | 665 | ||
666 | struct ap_data *ap; | 666 | struct ap_data *ap; |
667 | 667 | ||
diff --git a/drivers/net/wireless/ray_cs.h b/drivers/net/wireless/ray_cs.h index bd73ebf03340..1e23b7f4cca7 100644 --- a/drivers/net/wireless/ray_cs.h +++ b/drivers/net/wireless/ray_cs.h | |||
@@ -33,8 +33,8 @@ typedef struct ray_dev_t { | |||
33 | void __iomem *rmem; /* pointer to receive buffer window */ | 33 | void __iomem *rmem; /* pointer to receive buffer window */ |
34 | struct pcmcia_device *finder; /* pointer back to struct pcmcia_device for card */ | 34 | struct pcmcia_device *finder; /* pointer back to struct pcmcia_device for card */ |
35 | struct timer_list timer; | 35 | struct timer_list timer; |
36 | long tx_ccs_lock; | 36 | unsigned long tx_ccs_lock; |
37 | long ccs_lock; | 37 | unsigned long ccs_lock; |
38 | int dl_param_ccs; | 38 | int dl_param_ccs; |
39 | union { | 39 | union { |
40 | struct b4_startup_params b4; | 40 | struct b4_startup_params b4; |