diff options
| author | Thierry Vignaud <tv@mageia.org> | 2011-05-19 01:03:13 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2011-05-19 01:03:13 +0000 |
| commit | caa36150d1c9ea29c66dd1c88fceb120090efcbd (patch) | |
| tree | 4752aa280aca3fb3f854e692c82adddf032cd813 /mdk-stage1 | |
| parent | 104544a36cdc9da333d7d7c50089a99ceb319eb1 (diff) | |
| download | drakx-caa36150d1c9ea29c66dd1c88fceb120090efcbd.tar drakx-caa36150d1c9ea29c66dd1c88fceb120090efcbd.tar.gz drakx-caa36150d1c9ea29c66dd1c88fceb120090efcbd.tar.bz2 drakx-caa36150d1c9ea29c66dd1c88fceb120090efcbd.tar.xz drakx-caa36150d1c9ea29c66dd1c88fceb120090efcbd.zip | |
(pcmcia_probe) do not attempt to perform ISA probe for PCMCIA controller on
x86_64 as it fails with kvm_amd (#1156)
Diffstat (limited to 'mdk-stage1')
| -rw-r--r-- | mdk-stage1/NEWS | 3 | ||||
| -rw-r--r-- | mdk-stage1/pcmcia/probe.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index fd9689389..fd6e5e3f4 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,6 @@ +- do not attempt to perform ISA probe for PCMCIA controller on x86_64 + as it fails with kvm_amd (#1156) + 1.49: - use new libldetect API for finding out unknown devices - handle more PCMCIA controllers diff --git a/mdk-stage1/pcmcia/probe.c b/mdk-stage1/pcmcia/probe.c index 6aab709ec..622d898f5 100644 --- a/mdk-stage1/pcmcia/probe.c +++ b/mdk-stage1/pcmcia/probe.c @@ -520,10 +520,12 @@ char * pcmcia_probe(void) { if (!pci_probe()) return driver; +#if !defined(__x86_64__) else if (!i365_probe()) return "pd6729"; else if (!tcic_probe()) return "tcic"; +#endif else return NULL; } |