summaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-05-14 23:28:47 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-14 23:28:47 -0700
commitffd8211fb18e1052b2d9eded629cc3c0b872d06a (patch)
tree3abee7e97becc83b75aa4e5d73b3127f5d0ea30b /drivers/atm
parent01bbf2c7ddc93479eecebf8495848c0f362130c5 (diff)
downloadlinux-ffd8211fb18e1052b2d9eded629cc3c0b872d06a.tar.gz
linux-ffd8211fb18e1052b2d9eded629cc3c0b872d06a.tar.bz2
linux-ffd8211fb18e1052b2d9eded629cc3c0b872d06a.zip
iphase: Fix 64bit warning.
Time is unsigned long (except when you are in a hurry) so we need to store rx_tmp_jif in the right sized object. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/iphase.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h
index 133eefcc0475..b2cd20f549cb 100644
--- a/drivers/atm/iphase.h
+++ b/drivers/atm/iphase.h
@@ -1025,7 +1025,8 @@ typedef struct iadev_t {
spinlock_t rx_lock, misc_lock;
struct atm_vcc **rx_open; /* list of all open VCs */
u16 num_rx_desc, rx_buf_sz, rxing;
- u32 rx_pkt_ram, rx_tmp_cnt, rx_tmp_jif;
+ u32 rx_pkt_ram, rx_tmp_cnt;
+ unsigned long rx_tmp_jif;
void __iomem *RX_DESC_BASE_ADDR;
u32 drop_rxpkt, drop_rxcell, rx_cell_cnt, rx_pkt_cnt;
struct atm_dev *next_board; /* other iphase devices */