Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5bcec54f026b13617ec8aa8fa229970f9acf8dd5
Commit: 5bcec54f026b13617ec8aa8fa229970f9acf8dd5
Parent: 01b2726dd11ef198ac6cf8f88974b4427d40ffdb
Author: Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Apr 27 14:32:37 2007 +1000
Committer: Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:51:56 2007 +1000
[POWERPC] Partially revert a7edd0e676d51145ae634a2acf7a447e319200fa
Due to conflicts with the network drivers tree.
Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
drivers/net/ehea/ehea_main.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index d1a8134..0e4042b 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -2320,7 +2320,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
struct net_device *dev = port->netdev;
struct ehea_adapter *adapter = port->adapter;
struct hcp_ehea_port_cb4 *cb4;
- const u32 *dn_log_port_id;
+ u32 *dn_log_port_id;
int jumbo = 0;
sema_init(&port->port_lock, 1);
@@ -2336,7 +2336,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
port->of_dev_node = dn;
/* Determine logical port id */
- dn_log_port_id = get_property(dn, "ibm,hea-port-no", NULL);
+ dn_log_port_id = (u32*)get_property(dn, "ibm,hea-port-no", NULL);
if (!dn_log_port_id) {
ehea_error("bad device node: dn_log_port_id=%p",
@@ -2492,7 +2492,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
const struct of_device_id *id)
{
struct ehea_adapter *adapter;
- const u64 *adapter_handle;
+ u64 *adapter_handle;
int ret;
adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
@@ -2502,7 +2502,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
goto out;
}
- adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle",
+ adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
NULL);
if (adapter_handle)
adapter->handle = *adapter_handle;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
