From: David Miller <davem@davemloft.net>
Date: Mon, 05 Jan 2015 22:41:37 -0500 (EST)

> From: Feng Kan <fkan@apm.com>
> Date: Mon,  5 Jan 2015 17:42:56 -0800
> 
>> This adds support for APM X-Gene ethernet driver to use ACPI table to derive
>> ethernet driver parameter.
>> 
>> Signed-off-by: Feng Kan <fkan@apm.com>
> 
> Applied.

Actually, reverted, this breaks the build:

drivers/net/ethernet/apm/xgene/xgene_enet_main.c:1031:28: warning: �xgene_enet_of_match� defined but not used [-Wunused-variable]
 static struct of_device_id xgene_enet_of_match[] = {
                            ^
In file included from drivers/net/ethernet/apm/xgene/xgene_enet_main.h:32:0,
                 from drivers/net/ethernet/apm/xgene/xgene_enet_main.c:22:
include/linux/module.h:138:40: error: �__mod_of__xgene_enet_match_device_table� aliased to undefined symbol �xgene_enet_match�
   extern const struct type##_device_id __mod_##type##__##name##_device_table \
                                        ^
drivers/net/ethernet/apm/xgene/xgene_enet_main.c:1036:1: note: in expansion of macro �MODULE_DEVICE_TABLE�
 MODULE_DEVICE_TABLE(of, xgene_enet_match);
 ^
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�