X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=drivers%2Fatm%2Fiphase.h;h=077735e0e04bfdd1d12f048ac8006f8a598832f8;hb=ec622ab072e95cf96e78ab4d39d4eea874518c80;hp=133eefcc047507376977417dd056ae6bf4de8ea9;hpb=5f765b8d68fe99c8a575265d81c62382893e1e8a;p=net-next-2.6.git

diff --git a/drivers/atm/iphase.h b/drivers/atm/iphase.h
index 133eefcc047..077735e0e04 100644
--- a/drivers/atm/iphase.h
+++ b/drivers/atm/iphase.h
@@ -1022,10 +1022,11 @@ typedef struct iadev_t {
 	struct dle_q rx_dle_q;  
 	struct free_desc_q *rx_free_desc_qhead;  
 	struct sk_buff_head rx_dma_q;  
-        spinlock_t rx_lock, misc_lock;
+	spinlock_t rx_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 */