diff options
| author | Brent Casavant <bcasavan@sgi.com> | 2006-06-23 02:05:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 07:43:07 -0700 |
| commit | f5befceb5cfecba49fdf61f8e0eb4d453200eac9 (patch) | |
| tree | d44d7b0375408895a686e274a4a336c271184d0a /drivers/ide | |
| parent | 862f5f0133f1c8a179dd93adc03d43f8f7e8bac5 (diff) | |
| download | linux-stable-f5befceb5cfecba49fdf61f8e0eb4d453200eac9.tar.gz linux-stable-f5befceb5cfecba49fdf61f8e0eb4d453200eac9.tar.bz2 linux-stable-f5befceb5cfecba49fdf61f8e0eb4d453200eac9.zip | |
[PATCH] SGI IOC4: Detect IO card variant
There are three different IO cards which an SGI IOC4 controller may find
itself on. One of these variants does not bring out the IDE and serial
signals, so we need to disable attaching the corresponding IOC4 subdrivers
to such cards.
Cleans up message clutter emitted during device probing.
Signed-off-by: Brent Casavant <bcasavan@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pci/sgiioc4.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 27c9eb989a9a..e125032bb403 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c @@ -723,6 +723,12 @@ static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = { int ioc4_ide_attach_one(struct ioc4_driver_data *idd) { + /* PCI-RT does not bring out IDE connection. + * Do not attach to this particular IOC4. + */ + if (idd->idd_variant == IOC4_VARIANT_PCI_RT) + return 0; + return pci_init_sgiioc4(idd->idd_pdev, &sgiioc4_chipsets[idd->idd_pci_id->driver_data]); } |