diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 13:14:22 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 13:14:22 +1100 |
| commit | dfe218b7ef0c1d561a0d5ce294c173f1551985ff (patch) | |
| tree | 10b9f4bfa92a1fe236df0af128aa2c12932faf07 /drivers/net/ibm_newemac/core.c | |
| parent | 34318c253b861f82bd4a2956e6c8ae8ee2c3aae7 (diff) | |
| parent | 1ff0fcfcb1a6d0a4c4d065ed230be7beae087b83 (diff) | |
Merge commit 'jwb/jwb-next'
Diffstat (limited to 'drivers/net/ibm_newemac/core.c')
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index efcf21c9f5c7..2ee2622258f5 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c @@ -2604,8 +2604,16 @@ static int __devinit emac_init_config(struct emac_instance *dev) if (of_device_is_compatible(np, "ibm,emac-440ep") || of_device_is_compatible(np, "ibm,emac-440gr")) dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX; - if (of_device_is_compatible(np, "ibm,emac-405ez")) + if (of_device_is_compatible(np, "ibm,emac-405ez")) { +#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x; +#else + printk(KERN_ERR "%s: Flow control not disabled!\n", + np->full_name); + return -ENXIO; +#endif + } + } /* Fixup some feature bits based on the device tree */ |