diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/block/umem.c | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/block/umem.c')
| -rw-r--r-- | drivers/block/umem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 4ada1268b40d..c16e66b9c7a7 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
| @@ -1131,7 +1131,7 @@ static void mm_pci_remove(struct pci_dev *dev) | |||
| 1131 | pci_free_consistent(card->dev, PAGE_SIZE*2, | 1131 | pci_free_consistent(card->dev, PAGE_SIZE*2, |
| 1132 | card->mm_pages[1].desc, | 1132 | card->mm_pages[1].desc, |
| 1133 | card->mm_pages[1].page_dma); | 1133 | card->mm_pages[1].page_dma); |
| 1134 | blk_put_queue(card->queue); | 1134 | blk_cleanup_queue(card->queue); |
| 1135 | } | 1135 | } |
| 1136 | 1136 | ||
| 1137 | static const struct pci_device_id mm_pci_ids[] = { { | 1137 | static const struct pci_device_id mm_pci_ids[] = { { |