projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] pcmcia: add some IDs for ide-cs and dtl1_cs
[powerpc.git]
/
drivers
/
net
/
gianfar_ethtool.c
diff --git
a/drivers/net/gianfar_ethtool.c
b/drivers/net/gianfar_ethtool.c
index
68e3578
..
765e810
100644
(file)
--- a/
drivers/net/gianfar_ethtool.c
+++ b/
drivers/net/gianfar_ethtool.c
@@
-6,7
+6,7
@@
* Based on e1000 ethtool support
*
* Author: Andy Fleming
* Based on e1000 ethtool support
*
* Author: Andy Fleming
- * Maintainer: Kumar Gala
(kumar.gala@freescale.com)
+ * Maintainer: Kumar Gala
*
* Copyright (c) 2003,2004 Freescale Semiconductor, Inc.
*
*
* Copyright (c) 2003,2004 Freescale Semiconductor, Inc.
*
@@
-34,7
+34,6
@@
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
#include <asm/irq.h>
#include <asm/uaccess.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/crc32.h>
#include <asm/types.h>
#include <asm/uaccess.h>
#include <linux/crc32.h>
#include <asm/types.h>
#include <asm/uaccess.h>
@@
-126,7
+125,7
@@
static char stat_gstrings[][ETH_GSTRING_LEN] = {
static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf)
{
struct gfar_private *priv = netdev_priv(dev);
static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf)
{
struct gfar_private *priv = netdev_priv(dev);
-
+
if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON)
memcpy(buf, stat_gstrings, GFAR_STATS_LEN * ETH_GSTRING_LEN);
else
if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON)
memcpy(buf, stat_gstrings, GFAR_STATS_LEN * ETH_GSTRING_LEN);
else