diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-12-05 17:13:54 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-12-05 17:13:54 +0000 |
| commit | 2c70f98fd37d4f4a81630830a8abab87084cfa9a (patch) | |
| tree | 746f59ad1b2119a3884e232c0823ea88b90c4fab /mdk-stage1/pcmcia_ | |
| parent | f06fc2cef872084dcca9d28230763c42ece44569 (diff) | |
| download | drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.tar drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.tar.gz drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.tar.bz2 drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.tar.xz drakx-2c70f98fd37d4f4a81630830a8abab87084cfa9a.zip | |
- fix problems with sockets not initialized (disabling
hotplug support -> cardmgr handles sockets)
- fix problems with PCMCIA net adapters now using PCI
modules, by adding PCMCIA base code in `network.img'
Diffstat (limited to 'mdk-stage1/pcmcia_')
| -rw-r--r-- | mdk-stage1/pcmcia_/cardmgr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/pcmcia_/cardmgr.c b/mdk-stage1/pcmcia_/cardmgr.c index 37598015c..1db18b55b 100644 --- a/mdk-stage1/pcmcia_/cardmgr.c +++ b/mdk-stage1/pcmcia_/cardmgr.c @@ -339,8 +339,8 @@ static void write_stab(void) fprintf(f, "Socket %d: ", i); if (!(s->state & SOCKET_PRESENT)) { fprintf(f, "empty\n"); - } else if (s->state & SOCKET_HOTPLUG) { - fprintf(f, "CardBus hotplug device\n"); +//mdk-stage1// } else if (s->state & SOCKET_HOTPLUG) { +//mdk-stage1// fprintf(f, "CardBus hotplug device\n"); } else if (!s->card) { fprintf(f, "unsupported card\n"); } else { @@ -547,10 +547,10 @@ static card_info_t *lookup_card(int ns) } } else { /* this is a 2.4 kernel; hotplug handles these cards */ - s->state |= SOCKET_HOTPLUG; +//mdk-stage1// s->state |= SOCKET_HOTPLUG; log_message("CM: socket %d: CardBus hotplug device", ns); //beep(BEEP_TIME, BEEP_OK); - return NULL; +//mdk-stage1// return NULL; } } |