Merge branch 'master' into devel

1 files changed, 7 insertions, 4 deletions

diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c
index 37a7112d4117..89d175ce74d2 100644
--- a/arch/arm/mach-shark/pci.c
+++ b/arch/arm/mach-shark/pci.c
@@ -16,16 +16,19 @@
 static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
         if (dev->bus->number == 0)
-                if (dev->devfn == 0) return 255;
-                else return 11;
-        else return 255;
+                if (dev->devfn == 0)
+                        return 255;
+                else
+                        return 11;
+        else
+                return 255;
 }
 
 extern void __init via82c505_preinit(void);
 
 static struct hw_pci shark_pci __initdata = {
         .setup          = via82c505_setup,
-        .swizzle        = pci_std_swizzle,
+        .swizzle        = pci_std_swizzle,
         .map_irq        = shark_map_irq,
         .nr_controllers = 1,
         .scan           = via82c505_scan_bus,