Subject: Re: [PATCH] amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict

From: Tom Lendacky <[email-masked]>
Date: Mon, 9 Jun 2014 10:17:38 -0500

On 06/09/2014 09:25 AM, David Laight wrote:
> From: Tom Lendacky
>> 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.
> ...
>> --- 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
>
> Might be worthwhile changing the other names at the same time.
>

I thought about that when creating this patch, but didn't want to
take it too far - just resolve the reported issue.

I'll submit a follow-on patch that renames the other defines if
that is acceptable.

Thanks,
Tom

> 	David