Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 22:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[POWERPC] Partially revert a7edd0e676

Browse Source 
Due to conflicts with the network drivers tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell 2007-04-27 14:32:37 +10:00 committed by Paul Mackerras
parent 01b2726dd1
commit 5bcec54f02
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ehea/ehea_main.c
View File

@ -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;