aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2005-07-03 06:32:40 -0400
committerJaroslav Kysela <perex@suse.cz>2005-07-28 06:21:31 -0400
commita6f6192bb38a76c4ad44c894144b1fbf3d14606b (patch)
treeeddaf2df0e34a9b8ad03f502f68bd262d47ef2d2 /sound
parent3818152e64866b54020b5656ff5fdd0f5e085183 (diff)
[ALSA] emu10k1: Sort by card id.
EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c80
1 files changed, 37 insertions, 43 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 9478a95e410f..6dca38120b90 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -714,54 +714,49 @@ static emu_chip_details_t emu_chip_details[] = {
714 .emu10k2_chip = 1, 714 .emu10k2_chip = 1,
715 .ca0102_chip = 1, 715 .ca0102_chip = 1,
716 .ac97_chip = 1} , 716 .ac97_chip = 1} ,
717 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102, 717 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,
718 .driver = "EMU10K1", .name = "E-mu APS [4001]", 718 .driver = "EMU10K1", .name = "SBLive! [SB0105]",
719 .id = "APS",
720 .emu10k1_chip = 1,
721 .ecard = 1} ,
722 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
723 .driver = "EMU10K1", .name = "SBLive! Player 5.1 [SB0060]",
724 .id = "Live", 719 .id = "Live",
725 .emu10k1_chip = 1, 720 .emu10k1_chip = 1,
726 .ac97_chip = 1, 721 .ac97_chip = 1,
727 .sblive51 = 1} , 722 .sblive51 = 1} ,
728 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102, 723 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,
729 .driver = "EMU10K1", .name = "SB Live 5.1", 724 .driver = "EMU10K1", .name = "SBLive! Value [SB0103]",
730 .id = "Live", 725 .id = "Live",
731 .emu10k1_chip = 1, 726 .emu10k1_chip = 1,
732 .ac97_chip = 1, 727 .ac97_chip = 1,
733 .sblive51 = 1} , 728 .sblive51 = 1} ,
734 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102, 729 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,
735 .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]", 730 .driver = "EMU10K1", .name = "SBLive! Value [SB0101]",
736 .id = "Live",
737 .emu10k1_chip = 1,
738 .ac97_chip = 1} ,
739 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
740 .driver = "EMU10K1", .name = "SBLive! [CT4620]",
741 .id = "Live", 731 .id = "Live",
742 .emu10k1_chip = 1, 732 .emu10k1_chip = 1,
743 .ac97_chip = 1, 733 .ac97_chip = 1,
744 .sblive51 = 1} , 734 .sblive51 = 1} ,
745 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102, 735 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,
746 .driver = "EMU10K1", .name = "SBLive! Value [CT4670]", 736 .driver = "EMU10K1", .name = "SB Live 5.1",
747 .id = "Live", 737 .id = "Live",
748 .emu10k1_chip = 1, 738 .emu10k1_chip = 1,
749 .ac97_chip = 1, 739 .ac97_chip = 1,
750 .sblive51 = 1} , 740 .sblive51 = 1} ,
751 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102, 741 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
752 .driver = "EMU10K1", .name = "SBLive! Value [CT4780]", 742 .driver = "EMU10K1", .name = "SBLive! Player 5.1 [SB0060]",
753 .id = "Live", 743 .id = "Live",
754 .emu10k1_chip = 1, 744 .emu10k1_chip = 1,
755 .ac97_chip = 1, 745 .ac97_chip = 1,
756 .sblive51 = 1} , 746 .sblive51 = 1} ,
757 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102, 747 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,
758 .driver = "EMU10K1", .name = "SB PCI512 [CT4790]", 748 .driver = "EMU10K1", .name = "SBLive! Value [CT4850]",
759 .id = "Live", 749 .id = "Live",
760 .emu10k1_chip = 1, 750 .emu10k1_chip = 1,
761 .ac97_chip = 1, 751 .ac97_chip = 1,
762 .sblive51 = 1} , 752 .sblive51 = 1} ,
763 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102, 753 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,
764 .driver = "EMU10K1", .name = "SBLive! Value [CT4830]", 754 .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]",
755 .id = "Live",
756 .emu10k1_chip = 1,
757 .ac97_chip = 1} ,
758 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,
759 .driver = "EMU10K1", .name = "SBLive! Value [CT4871]",
765 .id = "Live", 760 .id = "Live",
766 .emu10k1_chip = 1, 761 .emu10k1_chip = 1,
767 .ac97_chip = 1, 762 .ac97_chip = 1,
@@ -772,50 +767,49 @@ static emu_chip_details_t emu_chip_details[] = {
772 .emu10k1_chip = 1, 767 .emu10k1_chip = 1,
773 .ac97_chip = 1, 768 .ac97_chip = 1,
774 .sblive51 = 1} , 769 .sblive51 = 1} ,
775 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102, 770 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,
776 .driver = "EMU10K1", .name = "SBLive! Value [CT4832]", 771 .driver = "EMU10K1", .name = "SBLive! Value [CT4870]",
777 .id = "Live", 772 .id = "Live",
778 .emu10k1_chip = 1, 773 .emu10k1_chip = 1,
779 .ac97_chip = 1, 774 .ac97_chip = 1,
780 .sblive51 = 1} , 775 .sblive51 = 1} ,
781 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102, 776 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,
782 .driver = "EMU10K1", .name = "SBLive! Value [CT4850]", 777 .driver = "EMU10K1", .name = "SBLive! Value [CT4832]",
783 .id = "Live", 778 .id = "Live",
784 .emu10k1_chip = 1, 779 .emu10k1_chip = 1,
785 .ac97_chip = 1, 780 .ac97_chip = 1,
786 .sblive51 = 1} , 781 .sblive51 = 1} ,
787 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102, 782 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,
788 .driver = "EMU10K1", .name = "SBLive! Value [CT4870]", 783 .driver = "EMU10K1", .name = "SBLive! Value [CT4830]",
789 .id = "Live", 784 .id = "Live",
790 .emu10k1_chip = 1, 785 .emu10k1_chip = 1,
791 .ac97_chip = 1, 786 .ac97_chip = 1,
792 .sblive51 = 1} , 787 .sblive51 = 1} ,
793 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102, 788 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,
794 .driver = "EMU10K1", .name = "SBLive! Value [CT4871]", 789 .driver = "EMU10K1", .name = "SB PCI512 [CT4790]",
795 .id = "Live", 790 .id = "Live",
796 .emu10k1_chip = 1, 791 .emu10k1_chip = 1,
797 .ac97_chip = 1, 792 .ac97_chip = 1,
798 .sblive51 = 1} , 793 .sblive51 = 1} ,
799 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102, 794 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,
800 .driver = "EMU10K1", .name = "SBLive! Value [SB0060]", 795 .driver = "EMU10K1", .name = "SBLive! Value [CT4780]",
801 .id = "Live", 796 .id = "Live",
802 .emu10k1_chip = 1, 797 .emu10k1_chip = 1,
803 .ac97_chip = 1, 798 .ac97_chip = 1,
804 .sblive51 = 1} , 799 .sblive51 = 1} ,
805 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102, 800 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
806 .driver = "EMU10K1", .name = "SBLive! Value [SB0101]", 801 .driver = "EMU10K1", .name = "E-mu APS [4001]",
807 .id = "Live", 802 .id = "APS",
808 .emu10k1_chip = 1, 803 .emu10k1_chip = 1,
809 .ac97_chip = 1, 804 .ecard = 1} ,
810 .sblive51 = 1} , 805 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
811 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102, 806 .driver = "EMU10K1", .name = "SBLive! [CT4620]",
812 .driver = "EMU10K1", .name = "SBLive! Value [SB0103]",
813 .id = "Live", 807 .id = "Live",
814 .emu10k1_chip = 1, 808 .emu10k1_chip = 1,
815 .ac97_chip = 1, 809 .ac97_chip = 1,
816 .sblive51 = 1} , 810 .sblive51 = 1} ,
817 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102, 811 {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,
818 .driver = "EMU10K1", .name = "SBLive! [SB0105]", 812 .driver = "EMU10K1", .name = "SBLive! Value [CT4670]",
819 .id = "Live", 813 .id = "Live",
820 .emu10k1_chip = 1, 814 .emu10k1_chip = 1,
821 .ac97_chip = 1, 815 .ac97_chip = 1,
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-09 19:32:27 -0500