[GIT,PULL] ARM: mvebu cleanup for v3.9 round2

Commit Message

Arnd Bergmann Jan. 31, 2013, 2:11 p.m. UTC

On Thursday 31 January 2013, Jason Cooper wrote:
> Arnd, Olof,
> 
> Please don't pull this yet.  The nsa310 patch built fine at the tip of
> my for-next, but didn't do so well when applied to mvebu/cleanup.
> 
> I'll redo and resubmit the whole series of pr's.


FWIW, when I was building all defconfigs for for-next yesterday, I needed
this patch, but nothing else for mvebu or kirkwood.

	Arnd

index 61c4b18..970174a 100644

Comments

Jason Cooper Jan. 31, 2013, 2:19 p.m. UTC | #1

On Thu, Jan 31, 2013 at 02:11:32PM +0000, Arnd Bergmann wrote:
> On Thursday 31 January 2013, Jason Cooper wrote:
> > Arnd, Olof,
> > 
> > Please don't pull this yet.  The nsa310 patch built fine at the tip of
> > my for-next, but didn't do so well when applied to mvebu/cleanup.
> > 
> > I'll redo and resubmit the whole series of pr's.
> 
> 
> FWIW, when I was building all defconfigs for for-next yesterday, I needed
> this patch, but nothing else for mvebu or kirkwood.

Yep, that was it.  Thanks!  in mvebu/dt we init i2c via DT, and
mvebu/cleanup is before that.

thx,

Jason.

> index 61c4b18..970174a 100644
> --- a/arch/arm/mach-kirkwood/board-nsa310.c
> +++ b/arch/arm/mach-kirkwood/board-nsa310.c
> @@ -11,6 +11,7 @@
>  #include <linux/kernel.h>
>  #include <linux/init.h>
>  #include <linux/gpio.h>
> +#include <linux/i2c.h>
>  #include <mach/kirkwood.h>
>  #include <linux/of.h>
>  #include "common.h"

Patch

--- a/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/arch/arm/mach-kirkwood/board-nsa310.c
@@ -11,6 +11,7 @@ 
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/i2c.h>
 #include <mach/kirkwood.h>
 #include <linux/of.h>
 #include "common.h"