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/siimage.c | |
| parent | f03e64f2ca6ee3d0b7824536b1940497701fe766 (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ide/pci/siimage.c')
| -rw-r--r-- | drivers/ide/pci/siimage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 697f566fb90a..4ff89c7d990a 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
| @@ -1096,7 +1096,7 @@ static struct pci_driver driver = { | |||
| 1096 | .probe = siimage_init_one, | 1096 | .probe = siimage_init_one, |
| 1097 | }; | 1097 | }; |
| 1098 | 1098 | ||
| 1099 | static int siimage_ide_init(void) | 1099 | static int __init siimage_ide_init(void) |
| 1100 | { | 1100 | { |
| 1101 | return ide_pci_register_driver(&driver); | 1101 | return ide_pci_register_driver(&driver); |
| 1102 | } | 1102 | } |