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

[karo-tx-linux.git] / arch / arm / include / asm / setup.h

diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index f1e5a9bca2491d982bda9fda1d40aa7b63b0cfd8..95176af3df8cdd1a5df238b0d738da47db316bf6 100644 (file)
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -192,14 +192,10 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn }
 /*
  * Memory map description
  */
-#ifdef CONFIG_ARCH_LH7A40X
-# define NR_BANKS 16
-#else
-# define NR_BANKS 8
-#endif
+#define NR_BANKS 8
 
 struct membank {
-       unsigned long start;
+       phys_addr_t start;
        unsigned long size;
        unsigned int highmem;
 };