diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /drivers/sound/dev_table.c | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'drivers/sound/dev_table.c')
| -rw-r--r-- | drivers/sound/dev_table.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/sound/dev_table.c b/drivers/sound/dev_table.c index 71d820b9e..603886504 100644 --- a/drivers/sound/dev_table.c +++ b/drivers/sound/dev_table.c @@ -13,6 +13,7 @@ */ #include <linux/config.h> +#include <linux/init.h> #define _DEV_TABLE_C_ @@ -313,9 +314,12 @@ int sndtable_identify_card(char *name) return 0; } -void sound_setup(char *str, int *ints) +static int __init sound_setup(char *str) { int i, n = num_sound_cards; + int ints[32]; + + str = get_options(str, ARRAY_SIZE(ints), ints); /* * First disable all drivers @@ -325,7 +329,7 @@ void sound_setup(char *str, int *ints) snd_installed_cards[i].enabled = 0; if (ints[0] == 0 || ints[1] == 0) - return; + return 1; /* * Then enable them one by time */ @@ -343,7 +347,7 @@ void sound_setup(char *str, int *ints) /* * Add any future extensions here */ - return; + return 1; } ioaddr = (val & 0x000fff00) >> 8; irq = (val & 0x000000f0) >> 4; @@ -376,8 +380,12 @@ void sound_setup(char *str, int *ints) snd_installed_cards[ptr].config.card_subtype = 0; } } + + return 1; } +__setup("sound=", sound_setup); + struct address_info * sound_getconf(int card_type) { |