diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:55:21 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:55:21 -0700 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /drivers/staging/slicoss/slicoss.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'drivers/staging/slicoss/slicoss.c')
| -rw-r--r-- | drivers/staging/slicoss/slicoss.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 6f5d0bff435..ed47db5ce5f 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -1872,7 +1872,6 @@ static int slic_card_download(struct adapter *adapter) __iomem struct slic_regs *slic_regs = adapter->slic_regs; u32 instruction; u32 baseaddress; - u32 failure; u32 i; u32 numsects = 0; u32 sectsize[3]; @@ -4049,7 +4048,7 @@ static struct pci_driver slic_driver = { .name = DRV_NAME, .id_table = slic_pci_tbl, .probe = slic_entry_probe, - .remove = slic_entry_remove, + .remove = __devexit_p(slic_entry_remove), }; static int __init slic_module_init(void) |