Merge branches 'fixes', 'pgt-next' and 'versatile' into devel

2011-03-20 09:32:12 +00:00
parent 6d7ed21d17 7d85d61f6a 516295e5ab 3de4ade3d6
commit 196f020fbb
65 changed files with 1044 additions and 1194 deletions
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -195,7 +195,7 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn }
 #define NR_BANKS 8

 struct membank {
-	unsigned long start;
+	phys_addr_t start;
 	unsigned long size;
 	unsigned int highmem;
 };