linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: imx_v4_v5_defconfig: Select SMSC911X driver by default.
@ 2011-12-12 13:24 Fabio Estevam
  2011-12-12 14:17 ` Sascha Hauer
  0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2011-12-12 13:24 UTC (permalink / raw)
  To: linux-arm-kernel

Select SMSC911X driver by default.  

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/configs/imx_v4_v5_defconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 11a4192..a51e282 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -50,6 +50,7 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
+CONFIG_SMSC911X=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH] ARM: imx_v4_v5_defconfig: Select SMSC911X driver by default.
  2011-12-12 13:24 [PATCH] ARM: imx_v4_v5_defconfig: Select SMSC911X driver by default Fabio Estevam
@ 2011-12-12 14:17 ` Sascha Hauer
  2011-12-12 15:37   ` Arnd Bergmann
  0 siblings, 1 reply; 3+ messages in thread
From: Sascha Hauer @ 2011-12-12 14:17 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Fabio, Arnd,

On Mon, Dec 12, 2011 at 11:24:02AM -0200, Fabio Estevam wrote:
> Select SMSC911X driver by default.  
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

The patch is ok.

Arnd,

On which base should I apply this patch? It needs the i.MX5 -> imx
merge which shows up in your for-next branch, but all other i.MX
topic branches in your tree seem to be empty.

Sascha

> ---
>  arch/arm/configs/imx_v4_v5_defconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
> index 11a4192..a51e282 100644
> --- a/arch/arm/configs/imx_v4_v5_defconfig
> +++ b/arch/arm/configs/imx_v4_v5_defconfig
> @@ -50,6 +50,7 @@ CONFIG_INET=y
>  CONFIG_IP_MULTICAST=y
>  CONFIG_IP_PNP=y
>  CONFIG_IP_PNP_DHCP=y
> +CONFIG_SMSC911X=y
>  # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
>  # CONFIG_INET_XFRM_MODE_TUNNEL is not set
>  # CONFIG_INET_XFRM_MODE_BEET is not set
> -- 
> 1.7.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] ARM: imx_v4_v5_defconfig: Select SMSC911X driver by default.
  2011-12-12 14:17 ` Sascha Hauer
@ 2011-12-12 15:37   ` Arnd Bergmann
  0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2011-12-12 15:37 UTC (permalink / raw)
  To: linux-arm-kernel

On Monday 12 December 2011, Sascha Hauer wrote:
> On Mon, Dec 12, 2011 at 11:24:02AM -0200, Fabio Estevam wrote:
> > Select SMSC911X driver by default.  
> > 
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> 
> The patch is ok.
> 
> Arnd,
> 
> On which base should I apply this patch? It needs the i.MX5 -> imx
> merge which shows up in your for-next branch, but all other i.MX
> topic branches in your tree seem to be empty.
> 

Which tree are you looking at? I guess I should have announced when
the tree moved back to kernel.org, where there is only one branch
for imx right now.

Since I expect we will have to rebase the imx/move branch to get it
merged at the end of the 3.3 merge window, I can also fold the
new patch into "ARM i.MX: Update defconfig". If you prefer not
to rebase that branch, better apply it on top and send me an
updated pull request for imx/move or let me apply the patch on top.

	Arnd

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-12-12 15:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-12 13:24 [PATCH] ARM: imx_v4_v5_defconfig: Select SMSC911X driver by default Fabio Estevam
2011-12-12 14:17 ` Sascha Hauer
2011-12-12 15:37   ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).