diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-07-03 13:36:16 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-07-03 13:36:16 +0000 |
| commit | a3fd355593f7ab9ae5c6d57ec69ef3f5a2f8cb9a (patch) | |
| tree | 300ad979ae1af5541442635072cc3baa102a45a4 | |
| parent | f34c4b838d4746ccc4639bf4554e6200407ae157 (diff) | |
| download | drakx-a3fd355593f7ab9ae5c6d57ec69ef3f5a2f8cb9a.tar drakx-a3fd355593f7ab9ae5c6d57ec69ef3f5a2f8cb9a.tar.gz drakx-a3fd355593f7ab9ae5c6d57ec69ef3f5a2f8cb9a.tar.bz2 drakx-a3fd355593f7ab9ae5c6d57ec69ef3f5a2f8cb9a.tar.xz drakx-a3fd355593f7ab9ae5c6d57ec69ef3f5a2f8cb9a.zip | |
fixed static definition when non static declaration (gcc limitation).
added conditional code around network detection.
| -rw-r--r-- | mdk-stage1/probing.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index 6dd678ce0..04afc9ce0 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -120,7 +120,7 @@ char * get_net_intf_description(char * intf_name) } #endif -static void probe_that_type(enum driver_type type) +void probe_that_type(enum driver_type type) { if (IS_EXPERT) { ask_insmod(type); @@ -272,6 +272,7 @@ static void probe_that_type(enum driver_type type) for (i = 0; i < len; i++) { if (usbdb[i].vendor == vendor && usbdb[i].id == id) { log_message("USB: device %04x %04x is \"%s\" (%s)", vendor, id, usbdb[i].name, usbdb[i].module); +#ifndef DISABLE_NETWORK if (type == NETWORK_DEVICES) { stg1_info_message("About to load driver for usb network device:\n \n%s", usbdb[i].name); prepare_intf_descr(usbdb[i].name); @@ -279,6 +280,7 @@ static void probe_that_type(enum driver_type type) if (intf_descr_for_discover) /* for modules providing more than one net intf */ net_discovered_interface(NULL); } +#endif } } |