diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
| commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
| tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /drivers/ide/pci/cs5520.c | |
| parent | f03e64f2ca6ee3d0b7824536b1940497701fe766 (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ide/pci/cs5520.c')
| -rw-r--r-- | drivers/ide/pci/cs5520.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c index 079f7c86726b..ba6786aabf3b 100644 --- a/drivers/ide/pci/cs5520.c +++ b/drivers/ide/pci/cs5520.c | |||
| @@ -260,7 +260,7 @@ static struct pci_driver driver = { | |||
| 260 | .probe = cs5520_init_one, | 260 | .probe = cs5520_init_one, |
| 261 | }; | 261 | }; |
| 262 | 262 | ||
| 263 | static int cs5520_ide_init(void) | 263 | static int __init cs5520_ide_init(void) |
| 264 | { | 264 | { |
| 265 | return ide_pci_register_driver(&driver); | 265 | return ide_pci_register_driver(&driver); |
| 266 | } | 266 | } |