diff options
| author | David S. Miller | 2012-03-19 21:46:22 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-03-19 21:46:22 +0100 |
| commit | 277074777cd9c004b1ac32689772370c38fd00e2 (patch) | |
| tree | c8a1e7586cc9b16bcd662db6735acca6b9c5c558 /drivers/net/ethernet/freescale/gianfar.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | gianfar: use netif_tx_queue_stopped instead of __netif_subqueue_stopped (diff) | |
| download | kernel-qcow2-linux-277074777cd9c004b1ac32689772370c38fd00e2.tar.gz kernel-qcow2-linux-277074777cd9c004b1ac32689772370c38fd00e2.tar.xz kernel-qcow2-linux-277074777cd9c004b1ac32689772370c38fd00e2.zip | |
Merge branch 'gianfar-bql' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar.h')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h index 4fe0f342acec..fc2488adca36 100644 --- a/drivers/net/ethernet/freescale/gianfar.h +++ b/drivers/net/ethernet/freescale/gianfar.h @@ -78,11 +78,8 @@ struct ethtool_rx_list { #define INCREMENTAL_BUFFER_SIZE 512 #define PHY_INIT_TIMEOUT 100000 -#define GFAR_PHY_CHANGE_TIME 2 -#define DEVICE_NAME "%s: Gianfar Ethernet Controller Version 1.2, " #define DRV_NAME "gfar-enet" -extern const char gfar_driver_name[]; extern const char gfar_driver_version[]; /* MAXIMUM NUMBER OF QUEUES SUPPORTED */ |