From 03c17f8354f2c12a70588118348f093b97b927aa Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Thu, 21 Oct 2010 07:50:49 +0000 Subject: [PATCH] --- yaml --- r: 218383 b: refs/heads/master c: 0fb1e54ed17767521c18908d871f780f461ea1a6 h: refs/heads/master i: 218381: dd820fc4bd04282652b8358fe07df6ecb0a469be 218379: 08d0133b13722d555b5a634d2925a15825d6d984 218375: 0d0a3c2d1ab3e968b3511e75eac7d90a27481ee4 218367: 31b73434573625eebdd7febc9a5a7f1793a015be v: v3 --- [refs] | 2 +- trunk/drivers/net/atl1c/atl1c.h | 2 -- trunk/drivers/net/atl1c/atl1c_main.c | 6 ++++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 365a2aaf0598..2347814fbc3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49b052215b3319b69de8e2df412d06eae41088b4 +refs/heads/master: 0fb1e54ed17767521c18908d871f780f461ea1a6 diff --git a/trunk/drivers/net/atl1c/atl1c.h b/trunk/drivers/net/atl1c/atl1c.h index ef4115b897bf..9ab58097fa2e 100644 --- a/trunk/drivers/net/atl1c/atl1c.h +++ b/trunk/drivers/net/atl1c/atl1c.h @@ -631,8 +631,6 @@ struct atl1c_adapter { extern char atl1c_driver_name[]; extern char atl1c_driver_version[]; -extern int atl1c_up(struct atl1c_adapter *adapter); -extern void atl1c_down(struct atl1c_adapter *adapter); extern void atl1c_reinit_locked(struct atl1c_adapter *adapter); extern s32 atl1c_reset_hw(struct atl1c_hw *hw); extern void atl1c_set_ethtool_ops(struct net_device *netdev); diff --git a/trunk/drivers/net/atl1c/atl1c_main.c b/trunk/drivers/net/atl1c/atl1c_main.c index 99ffcf667d1f..09b099bfab2b 100644 --- a/trunk/drivers/net/atl1c/atl1c_main.c +++ b/trunk/drivers/net/atl1c/atl1c_main.c @@ -66,6 +66,8 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, bool linkup); static void atl1c_setup_mac_ctrl(struct atl1c_adapter *adapter); static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter, u8 que, int *work_done, int work_to_do); +static int atl1c_up(struct atl1c_adapter *adapter); +static void atl1c_down(struct atl1c_adapter *adapter); static const u16 atl1c_pay_load_size[] = { 128, 256, 512, 1024, 2048, 4096, @@ -2309,7 +2311,7 @@ static int atl1c_request_irq(struct atl1c_adapter *adapter) return err; } -int atl1c_up(struct atl1c_adapter *adapter) +static int atl1c_up(struct atl1c_adapter *adapter) { struct net_device *netdev = adapter->netdev; int num; @@ -2351,7 +2353,7 @@ int atl1c_up(struct atl1c_adapter *adapter) return err; } -void atl1c_down(struct atl1c_adapter *adapter) +static void atl1c_down(struct atl1c_adapter *adapter) { struct net_device *netdev = adapter->netdev;