diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-14 09:06:37 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-14 09:06:37 +0200 |
| commit | 4ae77115f1e21bb9a33a24e24c28ef28d9dcdbdf (patch) | |
| tree | 8152f31a7519600784b52cb82aa25686991938c7 | |
| parent | 9c0df9054729738c6fc8eebe061a35dd9e550f6e (diff) | |
| download | alsa-driver-build-unstable-4ae77115f1e21bb9a33a24e24c28ef28d9dcdbdf.tar.gz | |
Avoid patching for pci/ad1889 driver
It's just missing pci-ids, so let's define them in pci_ids_compat.h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | include/pci_ids_compat.h.in | 10 | ||||
| -rw-r--r-- | pci/Makefile | 3 | ||||
| -rw-r--r-- | pci/ad1889.h | 1 | ||||
| -rw-r--r-- | pci/ad1889.patch | 22 |
5 files changed, 11 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore index 15aacff06..f12cadc03 100644 --- a/.gitignore +++ b/.gitignore @@ -77,7 +77,6 @@ include/sound/.includes include/sound/*.h pci/ac97/ac97_bus.c pci/ac97/ac97_codec.c -pci/ad1889.c pci/ali5451/ali5451.c pci/atiixp.c pci/atiixp_modem.c diff --git a/include/pci_ids_compat.h.in b/include/pci_ids_compat.h.in index 67f4bec74..3e055ca5c 100644 --- a/include/pci_ids_compat.h.in +++ b/include/pci_ids_compat.h.in @@ -421,3 +421,13 @@ #ifndef PCI_VENDOR_ID_DIGIGRAM #define PCI_VENDOR_ID_DIGIGRAM 0x1369 #endif + +/* ad1889 */ +#ifndef PCI_VENDOR_ID_ANALOG_DEVICES +#define PCI_VENDOR_ID_ANALOG_DEVICES 0x11d4 +#endif + +#ifndef PCI_DEVICE_ID_AD1889JS +#define PCI_DEVICE_ID_AD1889JS 0x1889 +#endif + diff --git a/pci/Makefile b/pci/Makefile index 470a96e8e..a4000c03f 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 := atiixp.c atiixp_modem.c bt87x.c cmipci.c ens1370.c \ fm801.c intel8x0.c maestro3.c via82xx.c via82xx_modem.c obj-$(CONFIG_SND) += pdplus/ asihpi/ @@ -22,7 +22,6 @@ include $(SND_TOPDIR)/alsa-kernel/pci/Makefile 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 diff --git a/pci/ad1889.h b/pci/ad1889.h deleted file mode 100644 index b20be9a43..000000000 --- a/pci/ad1889.h +++ /dev/null @@ -1 +0,0 @@ -#include "../alsa-kernel/pci/ad1889.h" diff --git a/pci/ad1889.patch b/pci/ad1889.patch deleted file mode 100644 index 324fabc2e..000000000 --- a/pci/ad1889.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ../alsa-kernel/pci/ad1889.c 2007-12-20 11:47:36.000000000 +0100 -+++ ad1889.c 2007-12-20 11:57:28.000000000 +0100 -@@ -1,3 +1,4 @@ -+#include "adriver.h" - /* Analog Devices 1889 audio driver - * - * This is a driver for the AD1889 PCI audio chipset found -@@ -52,6 +53,14 @@ - - #define AD1889_DRVVER "Version: 1.7" - -+/* for 2.2.x kernels */ -+#ifndef PCI_VENDOR_ID_ANALOG_DEVICES -+#define PCI_VENDOR_ID_ANALOG_DEVICES 0x11d4 -+#endif -+#ifndef PCI_DEVICE_ID_AD1889JS -+#define PCI_DEVICE_ID_AD1889JS 0x1889 -+#endif -+ - MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>, Thibaut Varene <t-bone@parisc-linux.org>"); - MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver"); - MODULE_LICENSE("GPL"); |