diff mbox

mach-sa1100: fix PCI build problem

Message ID 1312539884-10631-1-git-send-email-linus.walleij@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Linus Walleij Aug. 5, 2011, 10:24 a.m. UTC
The PCI nanoengine driver in the SA1100 machine probably has not
been building for some time. It probably dragged hardware.h
in implicitly and now it doesn't anymore. After this an SA1100
build selecting all system variants will build successfully.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-sa1100/pci-nanoengine.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Linus Walleij Aug. 10, 2011, 7:58 a.m. UTC | #1
2011/8/5 Linus Walleij <linus.walleij@linaro.org>:

> The PCI nanoengine driver in the SA1100 machine probably has not
> been building for some time. It probably dragged hardware.h
> in implicitly and now it doesn't anymore. After this an SA1100
> build selecting all system variants will build successfully.

Arnd can you pick this single patch for the -rc series, or do you
prefer pull requests?

Thanks,
Linus Walleij
Arnd Bergmann Aug. 10, 2011, 4:05 p.m. UTC | #2
On Wednesday 10 August 2011, Linus Walleij wrote:
> 2011/8/5 Linus Walleij <linus.walleij@linaro.org>:
> 
> > The PCI nanoengine driver in the SA1100 machine probably has not
> > been building for some time. It probably dragged hardware.h
> > in implicitly and now it doesn't anymore. After this an SA1100
> > build selecting all system variants will build successfully.
> 
> Arnd can you pick this single patch for the -rc series, or do you
> prefer pull requests?

I've put this one into the fixes branch and will push it to Linus
when that branch has gained critical mass.

I generally prefer git pull requests, but for single patches,
email is absolutely fine and I won't reject patches I get by
email. However, when you want me to apply a patch or git tree,
please always take me on Cc. When you send something only to the
mailing list, I will assume that it's for either review or that
you are sending it to someone else.

To make it less ambiguous, best put me in the 'To' field and the
mailing list on 'Cc' for stuff you want me to apply, or the other
way round for stuff that you want to have reviewed.

	Arnd
diff mbox

Patch

diff --git a/arch/arm/mach-sa1100/pci-nanoengine.c b/arch/arm/mach-sa1100/pci-nanoengine.c
index 964c6c3..dd39fee 100644
--- a/arch/arm/mach-sa1100/pci-nanoengine.c
+++ b/arch/arm/mach-sa1100/pci-nanoengine.c
@@ -28,6 +28,7 @@ 
 #include <asm/mach-types.h>
 
 #include <mach/nanoengine.h>
+#include <mach/hardware.h>
 
 static DEFINE_SPINLOCK(nano_lock);