From cdead3f714b521494fa7ab175208008a4ce76144 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 14 May 2008 23:28:47 -0700 Subject: [PATCH] --- yaml --- r: 97080 b: refs/heads/master c: ffd8211fb18e1052b2d9eded629cc3c0b872d06a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/atm/iphase.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8737d2059a73..2707a2152264 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01bbf2c7ddc93479eecebf8495848c0f362130c5 +refs/heads/master: ffd8211fb18e1052b2d9eded629cc3c0b872d06a diff --git a/trunk/drivers/atm/iphase.h b/trunk/drivers/atm/iphase.h index 133eefcc0475..b2cd20f549cb 100644 --- a/trunk/drivers/atm/iphase.h +++ b/trunk/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 */