From: Patrick Mochel Two drivers are #including the same .c file. Use them both and we get a sysfs naming clash. 25-akpm/sound/pci/ens1370.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff -puN sound/pci/ens1370.c~ens1370-name-fix sound/pci/ens1370.c --- 25/sound/pci/ens1370.c~ens1370-name-fix Fri Sep 12 14:51:15 2003 +++ 25-akpm/sound/pci/ens1370.c Fri Sep 12 14:51:15 2003 @@ -47,6 +47,13 @@ #define CHIP1370 #endif +#ifdef CHIP1370 +#define DRIVER_NAME "ENS1370" +#else +#define DRIVER_NAME "ENS1371" +#endif + + MODULE_AUTHOR("Jaroslav Kysela , Thomas Sailer "); MODULE_LICENSE("GPL"); MODULE_CLASSES("{sound}"); @@ -2324,12 +2331,8 @@ static int __devinit snd_audiopci_probe( snd_card_free(card); return err; } -#ifdef CHIP1370 - strcpy(card->driver, "ENS1370"); -#endif -#ifdef CHIP1371 - strcpy(card->driver, "ENS1371"); -#endif + strcpy(card->driver, DRIVER_NAME); + strcpy(card->shortname, "Ensoniq AudioPCI"); sprintf(card->longname, "%s %s at 0x%lx, irq %i", card->shortname, @@ -2354,7 +2357,7 @@ static void __devexit snd_audiopci_remov } static struct pci_driver driver = { - .name = "Ensoniq AudioPCI", + .name = DRIVER_NAME, .id_table = snd_audiopci_ids, .probe = snd_audiopci_probe, .remove = __devexit_p(snd_audiopci_remove), _