Patchwork ibm_newemac: Fix typo in flow control config option

login
register
mail settings
Submitter Josh Boyer
Date Oct. 24, 2008, 1:53 p.m.
Message ID <20081024135314.GA2299@yoda.jdub.homelinux.org>
Download mbox | patch
Permalink /patch/5673/
State Accepted
Commit c778e11d686dd4bde9efe12d8135a9bcbfef17ef
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Josh Boyer - Oct. 24, 2008, 1:53 p.m.
The recent build fix for ibm_newemac has a typo in the config
option #ifdef used for disabling flow control.  This corrects
it to the proper Kconfig option name.

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

---
Jeff Garzik - Oct. 27, 2008, 6:52 p.m.
Josh Boyer wrote:
> The recent build fix for ibm_newemac has a typo in the config
> option #ifdef used for disabling flow control.  This corrects
> it to the proper Kconfig option name.
> 
> Reported-by: Christoph Hellwig <hch@lst.de>
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> 
> ---
> 
> diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
> index 2ee2622..901212a 100644
> --- a/drivers/net/ibm_newemac/core.c
> +++ b/drivers/net/ibm_newemac/core.c
> @@ -2605,7 +2605,7 @@ static int __devinit emac_init_config(struct emac_instance *dev)
>  		    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")) {
> -#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL
> +#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
>  			dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
>  #else
>  			printk(KERN_ERR "%s: Flow control not disabled!\n",

applied


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 2ee2622..901212a 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2605,7 +2605,7 @@  static int __devinit emac_init_config(struct emac_instance *dev)
 		    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")) {
-#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL
+#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
 			dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
 #else
 			printk(KERN_ERR "%s: Flow control not disabled!\n",