diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
| commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
| tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /drivers/net/s2io.c | |
| parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
| parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 5303a96b432..258128a6a27 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -3070,7 +3070,7 @@ int s2io_set_swapper(nic_t * sp) static int wait_for_msix_trans(nic_t *nic, int i) { - XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; + XENA_dev_config_t __iomem *bar0 = nic->bar0; u64 val64; int ret = 0, cnt = 0; @@ -3091,7 +3091,7 @@ static int wait_for_msix_trans(nic_t *nic, int i) void restore_xmsi_data(nic_t *nic) { - XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; + XENA_dev_config_t __iomem *bar0 = nic->bar0; u64 val64; int i; @@ -3109,7 +3109,7 @@ void restore_xmsi_data(nic_t *nic) static void store_xmsi_data(nic_t *nic) { - XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; + XENA_dev_config_t __iomem *bar0 = nic->bar0; u64 val64, addr, data; int i; @@ -3132,7 +3132,7 @@ static void store_xmsi_data(nic_t *nic) int s2io_enable_msi(nic_t *nic) { - XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; + XENA_dev_config_t __iomem *bar0 = nic->bar0; u16 msi_ctrl, msg_val; struct config_param *config = &nic->config; struct net_device *dev = nic->dev; @@ -3182,7 +3182,7 @@ int s2io_enable_msi(nic_t *nic) int s2io_enable_msi_x(nic_t *nic) { - XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; + XENA_dev_config_t __iomem *bar0 = nic->bar0; u64 tx_mat, rx_mat; u16 msi_control; /* Temp variable */ int ret, i, j, msix_indx = 1; |