From 35fad8bdc9bfdb5dc7b40d892b52c1495515522f Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Fri, 6 Jan 2012 21:03:59 +0100 Subject: [PATCH] --- yaml --- r: 284273 b: refs/heads/master c: a5abec1e84c3d9cd197667e5fa94f25c21a2cb8e h: refs/heads/master i: 284271: c1ec9a2ae726309e4f97e5ffa69202a080bd208b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/via/via-rhine.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7afdaf05eb54..b14995e6214e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a20a28bc321fefcc23f8da7ce3722e6ae7a7199d +refs/heads/master: a5abec1e84c3d9cd197667e5fa94f25c21a2cb8e diff --git a/trunk/drivers/net/ethernet/via/via-rhine.c b/trunk/drivers/net/ethernet/via/via-rhine.c index 716fd423670d..d17ca32c8280 100644 --- a/trunk/drivers/net/ethernet/via/via-rhine.c +++ b/trunk/drivers/net/ethernet/via/via-rhine.c @@ -488,15 +488,8 @@ static struct net_device_stats *rhine_get_stats(struct net_device *dev); static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static const struct ethtool_ops netdev_ethtool_ops; static int rhine_close(struct net_device *dev); -static void rhine_shutdown (struct pci_dev *pdev); static int rhine_vlan_rx_add_vid(struct net_device *dev, unsigned short vid); static int rhine_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid); -static void rhine_set_cam(void __iomem *ioaddr, int idx, u8 *addr); -static void rhine_set_vlan_cam(void __iomem *ioaddr, int idx, u8 *addr); -static void rhine_set_cam_mask(void __iomem *ioaddr, u32 mask); -static void rhine_set_vlan_cam_mask(void __iomem *ioaddr, u32 mask); -static void rhine_init_cam_filter(struct net_device *dev); -static void rhine_update_vcam(struct net_device *dev); #define RHINE_WAIT_FOR(condition) \ do { \