aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'sound/sparc')
-rw-r--r--sound/sparc/Kconfig3
-rw-r--r--sound/sparc/amd7930.c3
-rw-r--r--sound/sparc/cs4231.c3
-rw-r--r--sound/sparc/dbri.c3
4 files changed, 0 insertions, 12 deletions
diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index ef022a846b06..079e22af074c 100644
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -7,7 +7,6 @@ config SND_SUN_AMD7930
7 tristate "Sun AMD7930" 7 tristate "Sun AMD7930"
8 depends on SBUS && SND 8 depends on SBUS && SND
9 select SND_PCM 9 select SND_PCM
10 select SND_GENERIC_DRIVER
11 help 10 help
12 Say Y here to include support for AMD7930 sound device on Sun. 11 Say Y here to include support for AMD7930 sound device on Sun.
13 12
@@ -18,7 +17,6 @@ config SND_SUN_CS4231
18 tristate "Sun CS4231" 17 tristate "Sun CS4231"
19 depends on SND 18 depends on SND
20 select SND_PCM 19 select SND_PCM
21 select SND_GENERIC_DRIVER
22 help 20 help
23 Say Y here to include support for CS4231 sound device on Sun. 21 Say Y here to include support for CS4231 sound device on Sun.
24 22
@@ -29,7 +27,6 @@ config SND_SUN_DBRI
29 tristate "Sun DBRI" 27 tristate "Sun DBRI"
30 depends on SND && SBUS 28 depends on SND && SBUS
31 select SND_PCM 29 select SND_PCM
32 select SND_GENERIC_DRIVER
33 help 30 help
34 Say Y here to include support for DBRI sound device on Sun. 31 Say Y here to include support for DBRI sound device on Sun.
35 32
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index c2710499b83a..55493340f467 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1079,9 +1079,6 @@ static int __init amd7930_attach(int prom_node, struct sbus_dev *sdev)
1079 if ((err = snd_amd7930_mixer(amd)) < 0) 1079 if ((err = snd_amd7930_mixer(amd)) < 0)
1080 goto out_err; 1080 goto out_err;
1081 1081
1082 if ((err = snd_card_set_generic_dev(card)) < 0)
1083 goto out_err;
1084
1085 if ((err = snd_card_register(card)) < 0) 1082 if ((err = snd_card_register(card)) < 0)
1086 goto out_err; 1083 goto out_err;
1087 1084
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 0fa482c9110b..14b1277bc83a 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1740,9 +1740,6 @@ static int cs4231_attach_finish(snd_card_t *card, cs4231_t *chip)
1740 if ((err = snd_cs4231_timer(chip)) < 0) 1740 if ((err = snd_cs4231_timer(chip)) < 0)
1741 goto out_err; 1741 goto out_err;
1742 1742
1743 if ((err = snd_card_set_generic_dev(card)) < 0)
1744 goto out_err;
1745
1746 if ((err = snd_card_register(card)) < 0) 1743 if ((err = snd_card_register(card)) < 0)
1747 goto out_err; 1744 goto out_err;
1748 1745
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 012c636019c7..293108ee7299 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2664,9 +2664,6 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
2664 /* /proc file handling */ 2664 /* /proc file handling */
2665 snd_dbri_proc(dbri); 2665 snd_dbri_proc(dbri);
2666 2666
2667 if ((err = snd_card_set_generic_dev(card)) < 0)
2668 goto _err;
2669
2670 if ((err = snd_card_register(card)) < 0) 2667 if ((err = snd_card_register(card)) < 0)
2671 goto _err; 2668 goto _err;
2672 2669