Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

[deliverable/linux.git] / drivers / block / cciss.c

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index acb2fa9cf6b1a161c77ac61e3603699333f9f143..d719a5d8f4355e45905410f4a1c0b506702d5bb4 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3004,7 +3004,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
        }
        return 0;
 
-      err_out_free_res:
+err_out_free_res:
        /*
         * Deliberately omit pci_disable_device(): it does something nasty to
         * Smart Array controllers that pci_enable_device does not undo