Skip to content

Commit d5c4858

Browse files
tlendackydavem330
authored andcommitted
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 <[email protected]> Signed-off-by: Tom Lendacky <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 581d9ba commit d5c4858

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/net/ethernet/amd/xgbe/xgbe-main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ static int xgbe_probe(struct platform_device *pdev)
230230
DBGPR("--> xgbe_probe\n");
231231

232232
netdev = alloc_etherdev_mq(sizeof(struct xgbe_prv_data),
233-
MAX_DMA_CHANNELS);
233+
XGBE_MAX_DMA_CHANNELS);
234234
if (!netdev) {
235235
dev_err(dev, "alloc_etherdev failed\n");
236236
ret = -ENOMEM;

drivers/net/ethernet/amd/xgbe/xgbe.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
#define RX_MIN_BUF_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
139139
#define RX_BUF_ALIGN 64
140140

141-
#define MAX_DMA_CHANNELS 16
141+
#define XGBE_MAX_DMA_CHANNELS 16
142142
#define DMA_ARDOMAIN_SETTING 0x2
143143
#define DMA_ARCACHE_SETTING 0xb
144144
#define DMA_AWDOMAIN_SETTING 0x2

0 commit comments

Comments
 (0)