diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
| commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
| tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /drivers/ide/pci/cy82c693.c | |
| parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
| parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ide/pci/cy82c693.c')
| -rw-r--r-- | drivers/ide/pci/cy82c693.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index bfae2f882f48..e6d8ee88d56d 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
| @@ -447,7 +447,7 @@ static struct pci_driver driver = { | |||
| 447 | .name = "Cypress_IDE", | 447 | .name = "Cypress_IDE", |
| 448 | .id_table = cy82c693_pci_tbl, | 448 | .id_table = cy82c693_pci_tbl, |
| 449 | .probe = cy82c693_init_one, | 449 | .probe = cy82c693_init_one, |
| 450 | .remove = cy82c693_remove, | 450 | .remove = __devexit_p(cy82c693_remove), |
| 451 | }; | 451 | }; |
| 452 | 452 | ||
| 453 | static int __init cy82c693_ide_init(void) | 453 | static int __init cy82c693_ide_init(void) |