diff options
| author | Ingo Molnar | 2009-08-23 11:18:47 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2009-08-23 11:18:47 +0200 |
| commit | 8a517c514d5893602cf85c1b4c47afbbc04d2198 (patch) | |
| tree | e7c40f68ef97bb2bdb4c366c0b45437bc049feb1 /drivers/staging/slicoss | |
| parent | x86, cpu: cpu/proc.c display cache alignment and address sizes for 32 bit (diff) | |
| parent | Linux 2.6.31-rc7 (diff) | |
| download | kernel-qcow2-linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.tar.gz kernel-qcow2-linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.tar.xz kernel-qcow2-linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.zip | |
Merge commit 'v2.6.31-rc7' into x86/cpu
Diffstat (limited to 'drivers/staging/slicoss')
| -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 6f5d0bff4358..ed47db5ce5ff 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) |