Merge branch 'symcheck2'

This commit is contained in:
Michael Brown
2007-07-28 22:55:31 +01:00
18 changed files with 30 additions and 29 deletions

View File

@@ -43,7 +43,7 @@ static struct bss {
struct statistics_block stats_blk;
} bnx2_bss;
struct bnx2 bnx2;
static struct bnx2 bnx2;
static struct flash_spec flash_table[] =
{

View File

@@ -364,7 +364,7 @@ struct ring_desc {
#endif
/* Private Storage for the NIC */
struct ns83820_private {
static struct ns83820_private {
u8 *base;
int up;
long idle;

View File

@@ -67,7 +67,7 @@ static struct nic_operations pcnet32_operations;
/* End Etherboot Specific */
int cards_found /* __initdata */ ;
static int cards_found = 0 /* __initdata */ ;
#ifdef REMOVE
/* FIXME: Remove these they are probably pointless */

View File

@@ -400,7 +400,7 @@ static void rtl8169_hw_PHY_config(struct nic *nic __unused);
// 20-16 5-bit GMII/MII register address
// 15-0 16-bit GMII/MII register data
//=================================================================
void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value)
static void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value)
{
int i;
@@ -418,7 +418,7 @@ void RTL8169_WRITE_GMII_REG(unsigned long ioaddr, int RegAddr, int value)
}
//=================================================================
int RTL8169_READ_GMII_REG(unsigned long ioaddr, int RegAddr)
static int RTL8169_READ_GMII_REG(unsigned long ioaddr, int RegAddr)
{
int i, value = -1;

View File

@@ -1204,7 +1204,7 @@ struct velocity_info_tbl {
u32 flags;
};
struct velocity_info_tbl *info;
static struct velocity_info_tbl *info;
#define mac_hw_mibs_init(regs) {\
BYTE_REG_BITS_ON(MIBCR_MIBFRZ,&((regs)->MIBCR));\
@@ -1768,7 +1768,7 @@ struct velocity_opt {
#define TX_DESC_MAX 256
#define TX_DESC_DEF TX_DESC_MIN
struct velocity_info {
static struct velocity_info {
// struct list_head list;
struct pci_device *pdev;