Merge commit 'v2.6.37-rc1' into for-2.6.37

[karo-tx-linux.git] / arch / frv / mb93090-mb00 / pci-frv.c

diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
index 16bc2cb5649aa08bf975f7fc2731378b5cb0e571..6b4fb28e9f997d1a9bf64f19cd26fba08ac8b9df 100644 (file)
--- a/arch/frv/mb93090-mb00/pci-frv.c
+++ b/arch/frv/mb93090-mb00/pci-frv.c
@@ -41,7 +41,7 @@ pcibios_align_resource(void *data, const struct resource *res,
        if ((res->flags & IORESOURCE_IO) && (start & 0x300))
                start = (start + 0x3ff) & ~0x3ff;
 
-       return start
+       return start;
 }