Merge commit 'v2.6.31-rc7' into x86/cleanups

Merge reason: we were on -rc1 before - go up to -rc7

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

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index daefc93ddffe..6ff9d71b4c0d 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -1531,7 +1531,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,
                  */
 
                 /* Calculate window size */
-                sa = (0xffffffffffffffffull << ilog2(ep_size));;
+                sa = (0xffffffffffffffffull << ilog2(ep_size));
 
                 /* Setup BAR0 */
                 out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa));
@@ -1550,7 +1550,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,
                 out_le32(mbase + PCI_BASE_ADDRESS_1, RES_TO_U32_HIGH(ep_addr));
         } else {
                 /* Calculate window size */
-                sa = (0xffffffffffffffffull << ilog2(size));;
+                sa = (0xffffffffffffffffull << ilog2(size));
                 if (res->flags & IORESOURCE_PREFETCH)
                         sa |= 0x8;