diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-08-06 16:26:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-30 09:44:15 +0200 |
| commit | 2cffb0cb8c7602ac50588f99975f0a979a4f5de7 (patch) | |
| tree | e414089b1fd9a292bd96a2e86c08217799fb5262 | |
| parent | da492a8cb01942bdcf5d8dc3a9cde83eb1089d4f (diff) | |
| download | alsa-driver-build-unstable-2cffb0cb8c7602ac50588f99975f0a979a4f5de7.tar.gz | |
Fix build stub to integrate via82xx-modem into via82xx driver
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | pci/Makefile | 3 | ||||
| -rw-r--r-- | pci/via82xx.patch | 18 | ||||
| -rw-r--r-- | pci/via82xx_modem.patch | 22 |
3 files changed, 10 insertions, 33 deletions
diff --git a/pci/Makefile b/pci/Makefile index b1c9b9bee..6e4364522 100644 --- a/pci/Makefile +++ b/pci/Makefile @@ -10,7 +10,7 @@ include $(SND_TOPDIR)/Makefile.conf # clean-files := ad1889.c atiixp.c bt87x.c cmipci.c ens1370.c \ - fm801.c intel8x0.c maestro3.c via82xx.c via82xx_modem.c + fm801.c intel8x0.c maestro3.c via82xx.c obj-$(CONFIG_SND) += pdplus/ asihpi/ @@ -32,4 +32,3 @@ fm801.c: fm801.patch $(SND_TOPDIR)/alsa-kernel/pci/fm801.c intel8x0.c: intel8x0.patch $(SND_TOPDIR)/alsa-kernel/pci/intel8x0.c maestro3.c: maestro3.patch $(SND_TOPDIR)/alsa-kernel/pci/maestro3.c via82xx.c: via82xx.patch $(SND_TOPDIR)/alsa-kernel/pci/via82xx.c -via82xx_modem.c: via82xx_modem.patch $(SND_TOPDIR)/alsa-kernel/pci/via82xx_modem.c diff --git a/pci/via82xx.patch b/pci/via82xx.patch index 2e06a65c3..5222d31c9 100644 --- a/pci/via82xx.patch +++ b/pci/via82xx.patch @@ -5,15 +5,15 @@ /* * ALSA driver for VIA VT82xx (South Bridge) * -@@ -2493,6 +2494,7 @@ - int chip_type = 0, card_type; +@@ -2572,6 +2573,7 @@ unsigned int i; int err; + int dev; + unsigned char revision = snd_pci_revision(pci); - err = snd_card_create(index, id, THIS_MODULE, 0, &card); - if (err < 0) -@@ -2502,14 +2504,14 @@ + card_type = pci_id->driver_data; + dev = card_type == TYPE_CARD_VIA82XX_MODEM ? 1 : 0; +@@ -2587,14 +2589,14 @@ switch (card_type) { case TYPE_CARD_VIA686: strcpy(card->driver, "VIA686A"); @@ -31,7 +31,7 @@ chip_type = via823x_cards[i].type; strcpy(card->shortname, via823x_cards[i].name); break; -@@ -2517,7 +2519,7 @@ +@@ -2602,7 +2604,7 @@ } if (chip_type != TYPE_VIA8233A) { if (dxs_support == VIA_DXS_AUTO) @@ -40,7 +40,7 @@ /* force to use VIA8233 or 8233A model according to * dxs_support module option */ -@@ -2528,7 +2530,7 @@ +@@ -2613,7 +2615,7 @@ } if (chip_type == TYPE_VIA8233A) strcpy(card->driver, "VIA8233A"); @@ -49,7 +49,7 @@ strcpy(card->driver, "VIA8237"); /* no slog assignment */ else strcpy(card->driver, "VIA8233"); -@@ -2539,7 +2541,7 @@ +@@ -2636,7 +2638,7 @@ goto __error; } @@ -58,7 +58,7 @@ ac97_clock, &chip)) < 0) goto __error; card->private_data = chip; -@@ -2622,3 +2624,5 @@ +@@ -2729,3 +2731,5 @@ module_init(alsa_card_via82xx_init) module_exit(alsa_card_via82xx_exit) diff --git a/pci/via82xx_modem.patch b/pci/via82xx_modem.patch deleted file mode 100644 index 529b76027..000000000 --- a/pci/via82xx_modem.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ../alsa-kernel/pci/via82xx_modem.c 2007-12-20 11:47:37.000000000 +0100 -+++ via82xx_modem.c 2007-12-20 12:18:27.000000000 +0100 -@@ -1,3 +1,4 @@ -+#include "adriver.h" - /* - * ALSA modem driver for VIA VT82xx (South Bridge) - * -@@ -1179,7 +1180,7 @@ - goto __error; - } - -- if ((err = snd_via82xx_create(card, pci, chip_type, pci->revision, -+ if ((err = snd_via82xx_create(card, pci, chip_type, snd_pci_revision(pci), - ac97_clock, &chip)) < 0) - goto __error; - card->private_data = chip; -@@ -1239,3 +1240,5 @@ - - module_init(alsa_card_via82xx_init) - module_exit(alsa_card_via82xx_exit) -+ -+EXPORT_NO_SYMBOLS; |