Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/mach-es7000/es7000plat.c b/arch/x86/mach-es7000/es7000plat.c
index 4354ce804889..50189af14b85 100644
--- a/arch/x86/mach-es7000/es7000plat.c
+++ b/arch/x86/mach-es7000/es7000plat.c
@@ -130,10 +130,10 @@ parse_unisys_oem (char *oemptr)
                         mip_addr = val;
                         mip = (struct mip_reg *)val;
                         mip_reg = __va(mip);
-                        Dprintk("es7000_mipcfg: host_reg = 0x%lx \n",
-                                (unsigned long)host_reg);
-                        Dprintk("es7000_mipcfg: mip_reg = 0x%lx \n",
-                                (unsigned long)mip_reg);
+                        pr_debug("es7000_mipcfg: host_reg = 0x%lx \n",
+                                 (unsigned long)host_reg);
+                        pr_debug("es7000_mipcfg: mip_reg = 0x%lx \n",
+                                 (unsigned long)mip_reg);
                         success++;
                         break;
                 case MIP_PSAI_REG: