| commit | 143ed290f02496fb918789cf14949e4e8033d34d | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Aug 12 15:45:44 2011 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Aug 12 15:45:44 2011 +0000 |
| tree | 02a2f503d4b6fac4598f326b8fa7ad009055c8c2 | |
| parent | ac9cf9ff4f4ffa355d0e93c2bd6d74961a16efad [diff] | |
| parent | d9c927833a42b4eaae4addd031f780f4530f7a2d [diff] |
Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
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);