From 55d59f9ae2af5e8f5ce0541fe4b69ca201b31f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Wed, 20 Apr 2011 18:27:09 +0200 Subject: [PATCH] --- yaml --- r: 249211 b: refs/heads/master c: 29bad1a139af7574df37613259298c198c4bf93c h: refs/heads/master i: 249209: ebae99cb6cd1fac5f0628692135852e3d80cb181 249207: e3a4cae5948372da5fd43373c6924d675a3f1bac v: v3 --- [refs] | 2 +- trunk/drivers/staging/octeon/ethernet-mdio.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 68acb0cb800a..623004e0d0a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4be6f5dab712db9e7e16e6120865c5bb1af4a41d +refs/heads/master: 29bad1a139af7574df37613259298c198c4bf93c diff --git a/trunk/drivers/staging/octeon/ethernet-mdio.c b/trunk/drivers/staging/octeon/ethernet-mdio.c index 10a82ef30215..8a11ffcd7de8 100644 --- a/trunk/drivers/staging/octeon/ethernet-mdio.c +++ b/trunk/drivers/staging/octeon/ethernet-mdio.c @@ -91,8 +91,6 @@ const struct ethtool_ops cvm_oct_ethtool_ops = { .set_settings = cvm_oct_set_settings, .nway_reset = cvm_oct_nway_reset, .get_link = ethtool_op_get_link, - .get_sg = ethtool_op_get_sg, - .get_tx_csum = ethtool_op_get_tx_csum, }; /**