diff options
Diffstat (limited to 'sound/ppc')
-rw-r--r-- | sound/ppc/Kconfig | 1 | ||||
-rw-r--r-- | sound/ppc/powermac.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig index 75213bf4d567..bda5bc4e6148 100644 --- a/sound/ppc/Kconfig +++ b/sound/ppc/Kconfig | |||
@@ -13,6 +13,7 @@ config SND_POWERMAC | |||
13 | tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)" | 13 | tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)" |
14 | depends on SND && I2C && INPUT && PPC_PMAC | 14 | depends on SND && I2C && INPUT && PPC_PMAC |
15 | select SND_PCM | 15 | select SND_PCM |
16 | select SND_GENERIC_DRIVER | ||
16 | help | 17 | help |
17 | Say Y here to include support for the integrated sound device. | 18 | Say Y here to include support for the integrated sound device. |
18 | 19 | ||
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 231f6432ea6d..a6d8cbf4064f 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c | |||
@@ -131,6 +131,9 @@ static int __init snd_pmac_probe(void) | |||
131 | if (enable_beep) | 131 | if (enable_beep) |
132 | snd_pmac_attach_beep(chip); | 132 | snd_pmac_attach_beep(chip); |
133 | 133 | ||
134 | if ((err = snd_card_set_generic_dev(card)) < 0) | ||
135 | goto __error; | ||
136 | |||
134 | if ((err = snd_card_register(card)) < 0) | 137 | if ((err = snd_card_register(card)) < 0) |
135 | goto __error; | 138 | goto __error; |
136 | 139 | ||