]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commit92f95322c65fef330cc0a6bb6ed3e7966f8635d5
treec89486ef22581a6bde693e519b27895d2787fca2
parent87e159c59d9f325d571689d4027115617adb32e6
parent48fed73ab6d2ef59d266e362afaabb73d9b1a2d6
Merge branch 'hix5hd2_gmac-compatible-string'

Dongpo Li says:

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

This patch series fix the patch:
d0fb6ba75dc0 ("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>