diff options
-rw-r--r-- | drivers/media/common/ir-keymaps.c | 1 | ||||
-rw-r--r-- | drivers/net/mv643xx_eth.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c index f51e02fe3655..0e948a5c5a03 100644 --- a/drivers/media/common/ir-keymaps.c +++ b/drivers/media/common/ir-keymaps.c | |||
@@ -698,7 +698,6 @@ IR_KEYTAB_TYPE ir_codes_pinnacle_grey[IR_KEYTAB_SIZE] = { | |||
698 | [ 0x29 ] = KEY_TEXT, | 698 | [ 0x29 ] = KEY_TEXT, |
699 | [ 0x2a ] = KEY_MEDIA, | 699 | [ 0x2a ] = KEY_MEDIA, |
700 | [ 0x18 ] = KEY_EPG, | 700 | [ 0x18 ] = KEY_EPG, |
701 | [ 0x27 ] = KEY_RECORD, | ||
702 | }; | 701 | }; |
703 | 702 | ||
704 | EXPORT_SYMBOL_GPL(ir_codes_pinnacle_grey); | 703 | EXPORT_SYMBOL_GPL(ir_codes_pinnacle_grey); |
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index b3bf86422734..d98e53efa2ef 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -2780,7 +2780,6 @@ static const struct ethtool_ops mv643xx_ethtool_ops = { | |||
2780 | .get_link = mv643xx_eth_get_link, | 2780 | .get_link = mv643xx_eth_get_link, |
2781 | .get_sg = ethtool_op_get_sg, | 2781 | .get_sg = ethtool_op_get_sg, |
2782 | .set_sg = ethtool_op_set_sg, | 2782 | .set_sg = ethtool_op_set_sg, |
2783 | .get_strings = mv643xx_get_strings, | ||
2784 | .get_stats_count = mv643xx_get_stats_count, | 2783 | .get_stats_count = mv643xx_get_stats_count, |
2785 | .get_ethtool_stats = mv643xx_get_ethtool_stats, | 2784 | .get_ethtool_stats = mv643xx_get_ethtool_stats, |
2786 | .get_strings = mv643xx_get_strings, | 2785 | .get_strings = mv643xx_get_strings, |