]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'hix5hd2_gmac-compatible-string'
authorDavid S. Miller <davem@davemloft.net>
Tue, 20 Dec 2016 19:12:30 +0000 (14:12 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Dec 2016 19:12:30 +0000 (14:12 -0500)
commita82f5adcf7e845970d5e3ea318b5f4da5e931ae4
treec89486ef22581a6bde693e519b27895d2787fca2
parent4eee5200c8fd9ae4f81826cdb2d7bfa1f781d712
parentc2d30e7126eb3b20ef5e418005d184fe72ececc6
Merge branch 'hix5hd2_gmac-compatible-string'

Dongpo Li says:

====================
net: hix5hd2_gmac: keep the compatible string not changed

This patch series fix the patch:
ba6b33c175a7 ("net: hix5hd2_gmac: add generic compatible string")

The SoC hix5hd2 compatible string has the suffix "-gmac" and
we should not change its compatible string.
So we should name all the compatible string with the suffix "-gmac".
Creating a new name suffix "-gemac" is unnecessary.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>