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/alim15x3.c | |
| parent | f03e64f2ca6ee3d0b7824536b1940497701fe766 (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
| -rw-r--r-- | drivers/ide/pci/alim15x3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 89109be5162c..68df77ec502b 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
| @@ -907,7 +907,7 @@ static struct pci_driver driver = { | |||
| 907 | .probe = alim15x3_init_one, | 907 | .probe = alim15x3_init_one, |
| 908 | }; | 908 | }; |
| 909 | 909 | ||
| 910 | static int ali15x3_ide_init(void) | 910 | static int __init ali15x3_ide_init(void) |
| 911 | { | 911 | { |
| 912 | return ide_pci_register_driver(&driver); | 912 | return ide_pci_register_driver(&driver); |
| 913 | } | 913 | } |