Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index b0910f97a3ea..ffb1733ac91f 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -106,14 +106,14 @@ enum fixed_addresses {
         __end_of_permanent_fixed_addresses,
 
         /*
-         * 256 temporary boot-time mappings, used by early_ioremap(),
+         * 512 temporary boot-time mappings, used by early_ioremap(),
          * before ioremap() is functional.
          *
-         * If necessary we round it up to the next 256 pages boundary so
+         * If necessary we round it up to the next 512 pages boundary so
          * that we can have a single pgd entry and a single pte table:
          */
 #define NR_FIX_BTMAPS           64
-#define FIX_BTMAPS_SLOTS        4
+#define FIX_BTMAPS_SLOTS        8
 #define TOTAL_FIX_BTMAPS        (NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)
         FIX_BTMAP_END =
          (__end_of_permanent_fixed_addresses ^