Home| summaryrefslogtreecommitdiff |
| author | Jeff Mahoney <jeffm@suse.com> | 2012-05-02 18:29:53 (GMT) |
|---|---|---|
| committer | Jeff Mahoney <jeffm@suse.com> | 2012-05-02 18:29:53 (GMT) |
| commit | e0eb7357505019bfac96bbc0ee14056abc1bb8c6 (patch) (unidiff) | |
| tree | c22ac187cdae004c43df1cb217971b0ce85709b2 | |
| parent | 4d1394acf06bc03f70528b7f3b01a351dc50ec18 (diff) | |
patches.drivers/ehea-modinfo.patch: Updated patch-mainline for submission.
| -rw-r--r-- | patches.drivers/ehea-modinfo.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/patches.drivers/ehea-modinfo.patch b/patches.drivers/ehea-modinfo.patch index 91cb279..0492c36 100644 --- a/patches.drivers/ehea-modinfo.patch +++ b/patches.drivers/ehea-modinfo.patch | |||
| @@ -1,21 +1,23 @@ | |||
| 1 | Subject: add alias entry for portN properties | 1 | From: Olaf Hering <ohering@suse.com> |
| 2 | From: olh@suse.de | 2 | Subject: ehea: add alias entry for portN properties |
| 3 | References: 435215 - LTC48564 | 3 | References: 435215 - LTC48564 |
| 4 | Patch-mainline: not yet | 4 | Patch-mainline: submitted 2 May 2012 to netdev |
| 5 | 5 | ||
| 6 | Use separate table for alias entries in the ehea module, | 6 | Use separate table for alias entries in the ehea module, |
| 7 | otherwise the probe() function will operate on the separate ports | 7 | otherwise the probe() function will operate on the separate ports |
| 8 | instead of the lhea-"root" entry of the device-tree | 8 | instead of the lhea-"root" entry of the device-tree |
| 9 | 9 | ||
| 10 | Signed-off-by: Jeff Mahoney <jeffm@suse.com> | ||
| 11 | Signed-off-by: Olaf Hering <ohering@suse.com> | ||
| 10 | --- | 12 | --- |
| 11 | drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +++++++++++++- | 13 | drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +++++++++++++- |
| 12 | 1 file changed, 13 insertions(+), 1 deletion(-) | 14 | 1 file changed, 13 insertions(+), 1 deletion(-) |
| 13 | 15 | ||
| 14 | --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c | 16 | --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c |
| 15 | +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | 17 | +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c |
| 16 | @@ -103,6 +103,19 @@ static int __devinit ehea_probe_adapter( | 18 | @@ -103,6 +103,19 @@ static int __devinit ehea_probe_adapter( |
| 17 | 19 | ||
| 18 | static int __devexit ehea_remove(struct platform_device *dev); | 20 | static int __devexit ehea_remove(struct platform_device *dev); |
| 19 | 21 | ||
| 20 | +static struct of_device_id ehea_module_device_table[] = { | 22 | +static struct of_device_id ehea_module_device_table[] = { |
| 21 | +{ | 23 | +{ |