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>
This commit is contained in:
parent
581d9baa21
commit
d5c4858237
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue