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:41:06 +0200 |
| commit | da492a8cb01942bdcf5d8dc3a9cde83eb1089d4f (patch) | |
| tree | 269de4991147c82096f88402c0a4f3d807e0ec86 | |
| parent | a10ae3ec328432a7fb2f3c1c9d6367e9a28e259f (diff) | |
| download | alsa-driver-build-unstable-da492a8cb01942bdcf5d8dc3a9cde83eb1089d4f.tar.gz | |
Fix build stub to integrate atiixp-modem into atiixp driver
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | pci/Makefile | 3 | ||||
| -rw-r--r-- | pci/atiixp.patch | 25 | ||||
| -rw-r--r-- | pci/atiixp_modem.patch | 22 |
3 files changed, 16 insertions, 34 deletions
diff --git a/pci/Makefile b/pci/Makefile index 470a96e8e..b1c9b9bee 100644 --- a/pci/Makefile +++ b/pci/Makefile @@ -9,7 +9,7 @@ include $(SND_TOPDIR)/Makefile.conf # ALSA extra code # -clean-files := ad1889.c atiixp.c atiixp_modem.c bt87x.c cmipci.c ens1370.c \ +clean-files := ad1889.c atiixp.c bt87x.c cmipci.c ens1370.c \ fm801.c intel8x0.c maestro3.c via82xx.c via82xx_modem.c obj-$(CONFIG_SND) += pdplus/ asihpi/ @@ -24,7 +24,6 @@ include $(SND_TOPDIR)/Rules.make ad1889.c: ad1889.patch $(SND_TOPDIR)/alsa-kernel/pci/ad1889.c atiixp.c: atiixp.patch $(SND_TOPDIR)/alsa-kernel/pci/atiixp.c -atiixp_modem.c: atiixp_modem.patch $(SND_TOPDIR)/alsa-kernel/pci/atiixp_modem.c bt87x.c: bt87x.patch $(SND_TOPDIR)/alsa-kernel/pci/bt87x.c cmipci.c: cmipci.patch $(SND_TOPDIR)/alsa-kernel/pci/cmipci.c ens1370.c: ens1370.patch $(SND_TOPDIR)/alsa-kernel/pci/ens1370.c diff --git a/pci/atiixp.patch b/pci/atiixp.patch index 41f19061c..44482d8c1 100644 --- a/pci/atiixp.patch +++ b/pci/atiixp.patch @@ -1,20 +1,25 @@ ---- ../alsa-kernel/pci/atiixp.c 2007-12-20 11:47:36.000000000 +0100 -+++ atiixp.c 2007-12-20 11:59:11.000000000 +0100 +--- ../alsa-kernel/pci/atiixp.c 2008-02-20 15:58:25.000000000 +0100 ++++ atiixp.c 2008-02-20 15:59:58.000000000 +0100 @@ -1,3 +1,4 @@ +#include "adriver.h" /* * ALSA driver for ATI IXP 150/200/250/300 AC97 controllers * -@@ -1670,7 +1671,7 @@ +@@ -1879,11 +1880,11 @@ - snprintf(card->longname, sizeof(card->longname), - "%s rev %x with %s at %#lx, irq %i", card->shortname, -- pci->revision, -+ snd_pci_revision(pci), - chip->ac97[0] ? snd_ac97_get_short_name(chip->ac97[0]) : "?", - chip->addr, chip->irq); + if (is_modem) + sprintf(card->longname, "%s rev %x at 0x%lx, irq %i", +- card->shortname, pci->revision, chip->addr, chip->irq); ++ card->shortname, snd_pci_revision(pci), chip->addr, chip->irq); + else + snprintf(card->longname, sizeof(card->longname), + "%s rev %x with %s at %#lx, irq %i", card->shortname, +- pci->revision, ++ snd_pci_revision(pci), + snd_ac97_get_short_name(chip->ac97[0]), + chip->addr, chip->irq); -@@ -1715,3 +1716,5 @@ +@@ -1928,3 +1929,5 @@ module_init(alsa_card_atiixp_init) module_exit(alsa_card_atiixp_exit) diff --git a/pci/atiixp_modem.patch b/pci/atiixp_modem.patch deleted file mode 100644 index e3fee602c..000000000 --- a/pci/atiixp_modem.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ../alsa-kernel/pci/atiixp_modem.c 2007-12-20 11:47:36.000000000 +0100 -+++ atiixp_modem.c 2007-12-20 11:59:28.000000000 +0100 -@@ -1,3 +1,4 @@ -+#include "adriver.h" - /* - * ALSA driver for ATI IXP 150/200/250 AC97 modem controllers - * -@@ -1306,7 +1307,7 @@ - snd_atiixp_chip_start(chip); - - sprintf(card->longname, "%s rev %x at 0x%lx, irq %i", -- card->shortname, pci->revision, chip->addr, chip->irq); -+ card->shortname, snd_pci_revision(pci), chip->addr, chip->irq); - - if ((err = snd_card_register(card)) < 0) - goto __error; -@@ -1349,3 +1350,5 @@ - - module_init(alsa_card_atiixp_init) - module_exit(alsa_card_atiixp_exit) -+ -+EXPORT_NO_SYMBOLS; |