Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus

[~andy/linux] / arch / arm / mach-shark / pci.c

diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c
index 37a7112d4117ee1e0e75b9ae6e58ea72d82c8baf..89d175ce74d2c3626b838770d250c802f937d4b5 100644 (file)
--- 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,