block: add fault injection mechanism for faking request timeouts

[linux-2.6-omap-h63xx.git] / sound / pci / trident / trident.c

diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index 9145f7c57fb0389cd81a219135351de779ba2aac..d94b16ffb38554660a8bd2647ad4d9024be2927f 100644 (file)
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/time.h>
@@ -30,7 +29,7 @@
 #include <sound/trident.h>
 #include <sound/initval.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, <audio@tridentmicro.com>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, <audio@tridentmicro.com>");
 MODULE_DESCRIPTION("Trident 4D-WaveDX/NX & SiS SI7018");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Trident,4DWave DX},"
@@ -155,13 +154,6 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
                return err;
        }
 
-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
-       if ((err = snd_trident_attach_synthesizer(trident)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
-#endif
-
        snd_trident_create_gameport(trident);
 
        if ((err = snd_card_register(card)) < 0) {