diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/ide/ide-probe.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 4a2cb2868226..194ecb0049eb 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -756,7 +756,8 @@ static int ide_probe_port(ide_hwif_t *hwif) | |||
| 756 | 756 | ||
| 757 | BUG_ON(hwif->present); | 757 | BUG_ON(hwif->present); |
| 758 | 758 | ||
| 759 | if (hwif->noprobe) | 759 | if (hwif->noprobe || |
| 760 | (hwif->drives[0].noprobe && hwif->drives[1].noprobe)) | ||
| 760 | return -EACCES; | 761 | return -EACCES; |
| 761 | 762 | ||
| 762 | /* | 763 | /* |