From 4058cbd6aa76c845e3746e64d95c0162714d06b8 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 19 Jun 2013 10:05:36 +1000 Subject: [PATCH] drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN properties Use separate table for alias entries in the ehea module, otherwise the probe() function will operate on the separate ports instead of the lhea-"root" entry of the device-tree Addresses https://bugzilla.novell.com/show_bug.cgi?id=435215 Signed-off-by: Jeff Mahoney Signed-off-by: Olaf Hering Signed-off-by: Jiri Slaby Cc: Thadeu Lima de Souza Cascardo Cc: "David S. Miller" Signed-off-by: Andrew Morton --- drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 35853b43d66e..741f11edf341 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -102,6 +102,19 @@ static int ehea_probe_adapter(struct platform_device *dev); static int ehea_remove(struct platform_device *dev); +static struct of_device_id ehea_module_device_table[] = { + { + .name = "lhea", + .compatible = "IBM,lhea", + }, + { + .type = "network", + .compatible = "IBM,lhea-ethernet", + }, + {}, +}; +MODULE_DEVICE_TABLE(of, ehea_module_device_table); + static struct of_device_id ehea_device_table[] = { { .name = "lhea", @@ -109,7 +122,6 @@ static struct of_device_id ehea_device_table[] = { }, {}, }; -MODULE_DEVICE_TABLE(of, ehea_device_table); static struct platform_driver ehea_driver = { .driver = { -- 2.39.5