diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2014-06-09 09:19:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-11 00:56:41 -0700 |
| commit | d5c4858237fe43c30714f4447ccec87d5fb3fcde (patch) | |
| tree | 57dca61ff6852e95939651040c6fd431283f30f3 /drivers/net | |
| parent | 581d9baa21dbd69b5b02cd654d858d064c400769 (diff) | |
amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict
MAX_DMA_CHANNELS is defined in asm/scatterlist.h of the powerpc
architecture. Rename this #define in xgbe.h to avoid the
redefined warning issued during compilation.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c index b21f9b929d9f..c83584a26713 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c @@ -230,7 +230,7 @@ static int xgbe_probe(struct platform_device *pdev) DBGPR("--> xgbe_probe\n"); netdev = alloc_etherdev_mq(sizeof(struct xgbe_prv_data), - MAX_DMA_CHANNELS); + XGBE_MAX_DMA_CHANNELS); if (!netdev) { dev_err(dev, "alloc_etherdev failed\n"); ret = -ENOMEM; diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h index 9a5bfe60db95..ab0627162c01 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h @@ -138,7 +138,7 @@ #define RX_MIN_BUF_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN) #define RX_BUF_ALIGN 64 -#define MAX_DMA_CHANNELS 16 +#define XGBE_MAX_DMA_CHANNELS 16 #define DMA_ARDOMAIN_SETTING 0x2 #define DMA_ARCACHE_SETTING 0xb #define DMA_AWDOMAIN_SETTING 0x2 |