diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /drivers/net/ibm_newemac | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'drivers/net/ibm_newemac')
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 1232ef9fb9ef..87a706694fb3 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
| @@ -2603,7 +2603,7 @@ static int __devinit emac_init_config(struct emac_instance *dev) | |||
| 2603 | of_device_is_compatible(np, "ibm,emac-440gr")) | 2603 | of_device_is_compatible(np, "ibm,emac-440gr")) |
| 2604 | dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX; | 2604 | dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX; |
| 2605 | if (of_device_is_compatible(np, "ibm,emac-405ez")) { | 2605 | if (of_device_is_compatible(np, "ibm,emac-405ez")) { |
| 2606 | #ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL | 2606 | #ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL |
| 2607 | dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x; | 2607 | dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x; |
| 2608 | #else | 2608 | #else |
| 2609 | printk(KERN_ERR "%s: Flow control not disabled!\n", | 2609 | printk(KERN_ERR "%s: Flow control not disabled!\n", |