summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/usb-resource
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-12-04 15:42:15 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-12-04 15:42:15 +0000
commit4ea909d089bcf223822d2370f022c30924dc216b (patch)
tree629d78c0ecf770c0ba09a03c14c5d5665a67c6b7 /mdk-stage1/usb-resource
parent236957fd6340b181d5f34629eceff43546e8e8e9 (diff)
downloaddrakx-4ea909d089bcf223822d2370f022c30924dc216b.tar
drakx-4ea909d089bcf223822d2370f022c30924dc216b.tar.gz
drakx-4ea909d089bcf223822d2370f022c30924dc216b.tar.bz2
drakx-4ea909d089bcf223822d2370f022c30924dc216b.tar.xz
drakx-4ea909d089bcf223822d2370f022c30924dc216b.zip
support install from USB CDROMS (using usb-storage)
Diffstat (limited to 'mdk-stage1/usb-resource')
-rwxr-xr-xmdk-stage1/usb-resource/update-usb-ids.pl10
1 files changed, 3 insertions, 7 deletions
diff --git a/mdk-stage1/usb-resource/update-usb-ids.pl b/mdk-stage1/usb-resource/update-usb-ids.pl
index 2e66db638..03ddb1355 100755
--- a/mdk-stage1/usb-resource/update-usb-ids.pl
+++ b/mdk-stage1/usb-resource/update-usb-ids.pl
@@ -25,8 +25,7 @@ struct usb_module_map {
};
';
-print "#ifdef ENABLE_USB
-struct pci_module_map usb_pci_ids[] = {
+print "struct pci_module_map usb_pci_ids[] = {
";
@@ -42,11 +41,10 @@ while (my ($k, $v) = each %$drivers) {
print "};
int usb_num_ids=sizeof(usb_pci_ids)/sizeof(struct pci_module_map);
-#endif
";
-my @t = ('usbnet');
+my @t = ('usb');
foreach $type (@t) {
@@ -56,8 +54,7 @@ foreach $type (@t) {
push @$modulez, (`../mar/mar -l $_`);
}
- print "#ifdef ENABLE_".uc($type)."
-struct usb_module_map ${type}_usb_ids[] = {
+ print "struct usb_module_map ${type}_usb_ids[] = {
";
foreach my $usbentry (@usbtable) {
grep(/^\t$usbentry->{'module'}\.o\s/, @$modulez) or next;
@@ -67,7 +64,6 @@ struct usb_module_map ${type}_usb_ids[] = {
print "};
int ${type}_usb_num_ids=sizeof(${type}_usb_ids)/sizeof(struct usb_module_map);
-#endif
";
}