diff options
-rw-r--r-- | sound/pci/pcxhr/pcxhr_hwdep.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c index ea50018d785b..592743a298b0 100644 --- a/sound/pci/pcxhr/pcxhr_hwdep.c +++ b/sound/pci/pcxhr/pcxhr_hwdep.c | |||
@@ -366,18 +366,18 @@ static int pcxhr_dsp_load(struct pcxhr_mgr *mgr, int index, | |||
366 | int pcxhr_setup_firmware(struct pcxhr_mgr *mgr) | 366 | int pcxhr_setup_firmware(struct pcxhr_mgr *mgr) |
367 | { | 367 | { |
368 | static char *fw_files[][5] = { | 368 | static char *fw_files[][5] = { |
369 | [0] = { "xi_1_882.dat", "xc_1_882.dat", | 369 | [0] = { "xlxint.dat", "xlxc882hr.dat", |
370 | "e321_512.e56", "b321_512.b56", "d321_512.d56" }, | 370 | "dspe882.e56", "dspb882hr.b56", "dspd882.d56" }, |
371 | [1] = { "xi_1_882.dat", "xc_882e.dat", | 371 | [1] = { "xlxint.dat", "xlxc882e.dat", |
372 | "e321_512.e56", "b882e.b56", "d321_512.d56" }, | 372 | "dspe882.e56", "dspb882e.b56", "dspd882.d56" }, |
373 | [2] = { "xi_1_882.dat", "xc_1222.dat", | 373 | [2] = { "xlxint.dat", "xlxc1222hr.dat", |
374 | "e321_512.e56", "b1222.b56", "d1222.d56" }, | 374 | "dspe882.e56", "dspb1222hr.b56", "dspd1222.d56" }, |
375 | [3] = { "xi_1_882.dat", "xc_1222e.dat", | 375 | [3] = { "xlxint.dat", "xlxc1222e.dat", |
376 | "e321_512.e56", "b1222e.b56", "d1222.d56" }, | 376 | "dspe882.e56", "dspb1222e.b56", "dspd1222.d56" }, |
377 | [4] = { NULL, "x1_222hr.dat", | 377 | [4] = { NULL, "xlxc222.dat", |
378 | "e924.e56", "b924.b56", "l_1_222.d56" }, | 378 | "dspe924.e56", "dspb924.b56", "dspd222.d56" }, |
379 | [5] = { NULL, "x1_924hr.dat", | 379 | [5] = { NULL, "xlxc924.dat", |
380 | "e924.e56", "b924.b56", "l_1_222.d56" }, | 380 | "dspe924.e56", "dspb924.b56", "dspd222.d56" }, |
381 | }; | 381 | }; |
382 | char path[32]; | 382 | char path[32]; |
383 | 383 | ||
@@ -404,25 +404,25 @@ int pcxhr_setup_firmware(struct pcxhr_mgr *mgr) | |||
404 | return 0; | 404 | return 0; |
405 | } | 405 | } |
406 | 406 | ||
407 | MODULE_FIRMWARE("pcxhr/xi_1_882.dat"); | 407 | MODULE_FIRMWARE("pcxhr/xlxint.dat"); |
408 | MODULE_FIRMWARE("pcxhr/xc_1_882.dat"); | 408 | MODULE_FIRMWARE("pcxhr/xlxc882hr.dat"); |
409 | MODULE_FIRMWARE("pcxhr/xc_882e.dat"); | 409 | MODULE_FIRMWARE("pcxhr/xlxc882e.dat"); |
410 | MODULE_FIRMWARE("pcxhr/e321_512.e56"); | 410 | MODULE_FIRMWARE("pcxhr/dspe882.e56"); |
411 | MODULE_FIRMWARE("pcxhr/b321_512.b56"); | 411 | MODULE_FIRMWARE("pcxhr/dspb882hr.b56"); |
412 | MODULE_FIRMWARE("pcxhr/b882e.b56"); | 412 | MODULE_FIRMWARE("pcxhr/dspb882e.b56"); |
413 | MODULE_FIRMWARE("pcxhr/d321_512.d56"); | 413 | MODULE_FIRMWARE("pcxhr/dspd882.d56"); |
414 | 414 | ||
415 | MODULE_FIRMWARE("pcxhr/xc_1222.dat"); | 415 | MODULE_FIRMWARE("pcxhr/xlxc1222hr.dat"); |
416 | MODULE_FIRMWARE("pcxhr/xc_1222e.dat"); | 416 | MODULE_FIRMWARE("pcxhr/xlxc1222e.dat"); |
417 | MODULE_FIRMWARE("pcxhr/b1222.b56"); | 417 | MODULE_FIRMWARE("pcxhr/dspb1222hr.b56"); |
418 | MODULE_FIRMWARE("pcxhr/b1222e.b56"); | 418 | MODULE_FIRMWARE("pcxhr/dspb1222e.b56"); |
419 | MODULE_FIRMWARE("pcxhr/d1222.d56"); | 419 | MODULE_FIRMWARE("pcxhr/dspd1222.d56"); |
420 | 420 | ||
421 | MODULE_FIRMWARE("pcxhr/x1_222hr.dat"); | 421 | MODULE_FIRMWARE("pcxhr/xlxc222.dat"); |
422 | MODULE_FIRMWARE("pcxhr/x1_924hr.dat"); | 422 | MODULE_FIRMWARE("pcxhr/xlxc924.dat"); |
423 | MODULE_FIRMWARE("pcxhr/e924.e56"); | 423 | MODULE_FIRMWARE("pcxhr/dspe924.e56"); |
424 | MODULE_FIRMWARE("pcxhr/b924.b56"); | 424 | MODULE_FIRMWARE("pcxhr/dspb924.b56"); |
425 | MODULE_FIRMWARE("pcxhr/l_1_222.d56"); | 425 | MODULE_FIRMWARE("pcxhr/dspd222.d56"); |
426 | 426 | ||
427 | 427 | ||
428 | #else /* old style firmware loading */ | 428 | #else /* old style firmware loading */ |