From: Jiri Slaby <jslaby@suse.cz>
To: jirislaby@gmail.com
Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
Olaf Hering <ohering@suse.com>, Jeff Mahoney <jeffm@suse.com>,
Jiri Slaby <jslaby@suse.cz>,
Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>,
netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH -resend 2/6] ehea: add alias entry for portN properties
Date: Wed, 22 May 2013 14:59:08 +0200 [thread overview]
Message-ID: <1369227552-11743-2-git-send-email-jslaby@suse.cz> (raw)
In-Reply-To: <1369227552-11743-1-git-send-email-jslaby@suse.cz>
From: Olaf Hering <ohering@suse.com>
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
References: https://bugzilla.novell.com/show_bug.cgi?id=435215
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Olaf Hering <ohering@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Cc: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
---
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 90ea0b1..1114418 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -103,6 +103,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",
@@ -110,7 +123,6 @@ static struct of_device_id ehea_device_table[] = {
},
{},
};
-MODULE_DEVICE_TABLE(of, ehea_device_table);
static struct of_platform_driver ehea_driver = {
.driver = {
--
1.8.2.3
next prev parent reply other threads:[~2013-05-22 12:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-22 12:59 [PATCH -resend 1/6] mISDN: Add support for group membership check Jiri Slaby
2013-05-22 12:59 ` Jiri Slaby [this message]
2013-05-22 12:59 ` [PATCH -resend 3/6] drm/cirrus: Correct register values for 16bpp Jiri Slaby
2013-05-22 12:59 ` [PATCH -resend 4/6] netfilter: Implement RFC 1123 for FTP conntrack Jiri Slaby
2013-05-27 12:20 ` Pablo Neira Ayuso
2013-05-22 12:59 ` [PATCH -resend 5/6] acpi: ec_sys: access user space with get_user()/put_user() Jiri Slaby
2013-05-22 23:39 ` Rafael J. Wysocki
2013-05-22 12:59 ` [PATCH -resend 6/6] nouveau: Make vga_switcheroo code depend on VGA_SWITCHEROO Jiri Slaby
2013-05-22 19:04 ` [PATCH -resend 1/6] mISDN: Add support for group membership check Sergei Shtylyov
2013-05-22 19:42 ` [PATCH v2 " Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369227552-11743-2-git-send-email-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=cascardo@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=jeffm@suse.com \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ohering@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®