Mark

On 07/14/2014 02:17 PM, Mark Brown wrote:
> On Mon, Jul 14, 2014 at 07:07:06PM +0000, Murphy, Dan wrote:
>> On 07/14/2014 01:43 PM, Mark Brown wrote:
>>>> +config SND_SOC_TAS2552
>>>> +  tristate "Texas Instruments TAS2552 Mono Audio amplifier"
>>>> +  depends on I2C
>>>> +
>>>>  endmenu
>>> Keep this and Makefile sorted - since this is a proper CODEC driver it
>>> should be in with the CODECs and also sorted in alphabetical order.
>> OK.  I was trying to stay away from a conflict by adding to the
>> bottom of the file.
> The whole point is to avoid conflicts - if everyone adds at the bottom
> of the file any two adds are pretty much guaranteed to conflict either
> on application or on merge.  Sorting avoids most of these and makes any
> that do occur much clearer.

No worries I will fix it

-- 
------------------
Dan Murphy

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to