Merge branch 'devel-stable' into devel

Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig
2010-05-17 17:24:04 +01:00
parent fda0e18c8a a3685f0065
commit ac1d426e82
5500 changed files with 78800 additions and 18040 deletions
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -14,6 +14,9 @@
 #ifndef ASMARM_AMBA_H
 #define ASMARM_AMBA_H

+#include <linux/device.h>
+#include <linux/resource.h>
+
 #define AMBA_NR_IRQS	2

 struct amba_device {
--- a/include/linux/amba/pl061.h
+++ b/include/linux/amba/pl061.h
@@ -1,3 +1,5 @@
+#include <linux/types.h>
+
 /* platform data for the PL061 GPIO driver */

 struct pl061_platform_data {