From f9ce930053939d8542ecf2334c090986e92789f5 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Wed, 20 Jul 2011 04:54:45 +0000 Subject: [PATCH] --- yaml --- r: 256589 b: refs/heads/master c: 9d846fec22db7b4876353e5e6e97dfc0878b6ada h: refs/heads/master i: 256587: 2aec6587db4011d5486d9fd130f6dd9e92975948 v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x_netdev.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 739d6f883d6a..741fcf44a8b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 223bb15e4a78115bb1bbc3e58e246d26f2c16462 +refs/heads/master: 9d846fec22db7b4876353e5e6e97dfc0878b6ada diff --git a/trunk/drivers/staging/et131x/et131x_netdev.c b/trunk/drivers/staging/et131x/et131x_netdev.c index b25bae29042e..95555d25fcb3 100644 --- a/trunk/drivers/staging/et131x/et131x_netdev.c +++ b/trunk/drivers/staging/et131x/et131x_netdev.c @@ -97,7 +97,6 @@ int et131x_tx(struct sk_buff *skb, struct net_device *netdev); void et131x_tx_timeout(struct net_device *netdev); int et131x_change_mtu(struct net_device *netdev, int new_mtu); int et131x_set_mac_addr(struct net_device *netdev, void *new_mac); -void et131x_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp); void et131x_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid); void et131x_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);