diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 09:15:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 09:15:34 -0800 |
| commit | 5faad620264290b17e80a8b0996b039ea0d5ac73 (patch) | |
| tree | 3adf5ccbd2794f9fd3b81f75031e4621a67137b1 /drivers/block | |
| parent | bbc7610c062074468f362b37d33603536e87fb96 (diff) | |
| parent | 2fc2c60df3d2b3a557eb8d750779def9d51934b1 (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] Fixup cciss error handling
[PATCH] Allow as-iosched to be unloaded
[PATCH 2/2] cciss: remove calls to pci_disable_device
[PATCH 1/2] cciss: map out more memory for config table
[PATCH] Propagate down request sync flag
Resolve trivial whitespace conflict in drivers/block/cciss.c manually.
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index acb2fa9cf6b..d719a5d8f43 100644 --- 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 |