Merge commit 'origin/master' into next

[linux-2.6-block.git] / arch / powerpc / platforms / pseries / xics.c

diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index f5f79196721c5d9b540ddee8eaade847d0026094..63eaa8a220c002de5e02ea16eaca791d7b90905e 100644 (file)
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -127,7 +127,7 @@ static inline unsigned int lpar_xirr_info_get(void)
 
        lpar_rc = plpar_xirr(&return_value);
        if (lpar_rc != H_SUCCESS)
-               panic(" bad return code xirr - rc = %lx \n", lpar_rc);
+               panic(" bad return code xirr - rc = %lx\n", lpar_rc);
        return (unsigned int)return_value;
 }