diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
| commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
| tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /drivers/scsi/aic7xxx/aic7770_osm.c | |
| parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
| parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7770_osm.c')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7770_osm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic7770_osm.c b/drivers/scsi/aic7xxx/aic7770_osm.c index d4ed5e9f830a..70c5fb59c9ea 100644 --- a/drivers/scsi/aic7xxx/aic7770_osm.c +++ b/drivers/scsi/aic7xxx/aic7770_osm.c | |||
| @@ -102,8 +102,7 @@ aic7770_probe(struct device *dev) | |||
| 102 | 102 | ||
| 103 | dev_set_drvdata(dev, ahc); | 103 | dev_set_drvdata(dev, ahc); |
| 104 | 104 | ||
| 105 | if (aic7xxx_detect_complete) | 105 | error = ahc_linux_register_host(ahc, &aic7xxx_driver_template); |
| 106 | error = ahc_linux_register_host(ahc, &aic7xxx_driver_template); | ||
| 107 | return (error); | 106 | return (error); |
| 108 | } | 107 | } |
| 109 | 108 | ||