diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /drivers/ide/pci/cmd64x.c | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'drivers/ide/pci/cmd64x.c')
| -rw-r--r-- | drivers/ide/pci/cmd64x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 20c32716bbc4..aee947e8fc38 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
| @@ -793,7 +793,7 @@ static struct pci_driver driver = { | |||
| 793 | .probe = cmd64x_init_one, | 793 | .probe = cmd64x_init_one, |
| 794 | }; | 794 | }; |
| 795 | 795 | ||
| 796 | static int cmd64x_ide_init(void) | 796 | static int __init cmd64x_ide_init(void) |
| 797 | { | 797 | { |
| 798 | return ide_pci_register_driver(&driver); | 798 | return ide_pci_register_driver(&driver); |
| 799 | } | 799 | } |