--- hwsetup.c.orig	2005-04-21 11:10:15.000000000 -0400
+++ hwsetup.c	2005-04-21 14:05:38.000000000 -0400
@@ -7,6 +7,7 @@
 \****************************************************************************/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
@@ -24,7 +25,7 @@
 
 #define VERSION "HWSETUP 1.0, an automatic hardware configuration tool\n" \
                 "(C) 2002 Klaus Knopper <knoppix@knopper.net>\n" \
-                "Modifications (C) 2004 René Rhéaume <rener@mediom.qc.ca>\n"
+                "Modifications (C) 2004,2005 René Rhéaume <rener@mediom.qc.ca>\n"
 
 #define CARDSDB "/usr/share/hwdata/Cards"
 #define XPATH "/usr/X11R6/bin/"
@@ -61,7 +62,8 @@ int syntax(char *option)
          "\t\t-a\tignore audio devices\n"
          "\t\t-s\tignore scsi controllers\n"
          "\t\t-n\tprobe only, don't configure anything\n"
-         "\t\t-f\trun a fast probe.");
+         "\t\t-f\trun a fast probe\n"
+         "\t\t-l\ttry to load an ALSA sound module.");
  return option?1:0;
 }
 
@@ -499,10 +501,11 @@ int writeconfig(char *name,struct device
  return 0;
 }
 
-int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip, int fastprobe)
+int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip, int fastprobe, int tryalsa)
 {
- int i,mouse=0,cdrom=0,modem=0,scanner=0;
+ int i,mouse=0,cdrom=0,modem=0,scanner=0,alsaok=0;
  int probeopt=fastprobe?PROBE_SAFE:PROBE_ALL;
+ const char *alsadriver=NULL;
  struct device **currentDevs, *d, *serialmouse=NULL, *usbmouse=NULL;
  if(verbose&VERBOSE_PROMPT) wpid=startwheel();
  if((currentDevs=probeDevices(dc,BUS_UNSPEC,probeopt))==NULL) return -1;
@@ -537,8 +540,23 @@ int hw_setup(enum deviceClass dc, int ve
        case CLASS_VIDEO:   writeconfig("/etc/sysconfig/xserver",d,verbose);
                            break;
        case CLASS_AUDIO:   if(skip&SKIP_AUDIO) break;
+                           if(tryalsa)
+                            {
+                             alsaok=0;
+                             asprintf(&alsadriver, "snd-%s", d->driver);
+                             if (load_mod(alsadriver,verbose) == 0)
+                              {
+                               d->driver=alsadriver;
+                               writeconfig("/etc/sysconfig/sound",d,verbose);
+                               alsaok=1;
+                              }
+                            }
+                           if(!alsaok) /* fallback */
+                            {
                            writeconfig("/etc/sysconfig/sound",d,verbose);
                            load_mod(d->driver,verbose); break;
+                            }
+                           break;
        case CLASS_NETWORK: writeconfig("/etc/sysconfig/netcard",d,verbose);
                            load_mod(d->driver,verbose); break;
        case CLASS_FLOPPY:  writeconfig("/etc/sysconfig/floppy",d,verbose);
@@ -554,12 +572,13 @@ int hw_setup(enum deviceClass dc, int ve
       }
     }
   }
+ if(alsadriver!=NULL) free(alsadriver);
  return 0;
 }
 
 int main(int argc, char **argv)
 {
- int i, verbose=0, probeonly=0, skip=0, fast=0;
+ int i, verbose=0, probeonly=0, skip=0, fast=0, alsaaudio=0;
  enum deviceClass dc=CLASS_UNSPEC;
  for(i=1;i<argc;i++)
   {
@@ -569,10 +588,11 @@ int main(int argc, char **argv)
    else if(!strcasecmp(argv[i],"-s")) skip|=SKIP_SCSI;
    else if(!strcasecmp(argv[i],"-n")) probeonly=1;
    else if(!strcasecmp(argv[i],"-f")) fast=1;
+   else if(!strcasecmp(argv[i],"-l")) alsaaudio=1;
    else return syntax(argv[i]);
   }
  /* Allow SIGTERM, SIGINT: rmmod depends on this. */
  signal(SIGTERM,SIG_DFL); signal(SIGINT,SIG_DFL);
  signal(SIGALRM,alarm_handler); alarm(MAX_TIME);
- return hw_setup(dc,verbose,probeonly,skip,fast);
+ return hw_setup(dc,verbose,probeonly,skip,fast,alsaaudio);
 }