diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-05-24 18:39:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-24 18:39:38 -0700 |
| commit | a979373197badc27c0bb8db2b5034035316baa97 (patch) | |
| tree | a005aa2e1ee82df6f3a240c1554c23f436eac9f4 /sound | |
| parent | 1b4d4894abd600416a0656d1f6b91250581c2c4b (diff) | |
| download | history-a979373197badc27c0bb8db2b5034035316baa97.tar.gz | |
[PATCH] add one more neomagic audio device id
From: Christoph Hellwig <hch@lst.de>
From: Mattia Monga via Debian kernel package
Add support for nm256xl+ in sound/oss/nm256_audio.c
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/oss/nm256_audio.c | 5 | ||||
| -rw-r--r-- | sound/pci/nm256/nm256.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c index 777492c35dc474..5cdea9d107fe94 100644 --- a/sound/oss/nm256_audio.c +++ b/sound/oss/nm256_audio.c @@ -52,6 +52,7 @@ static int handle_pm_event (struct pm_dev *dev, pm_request_t rqst, void *data); /* These belong in linux/pci.h. */ #define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005 #define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006 +#define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016 /* List of cards. */ static struct nm256_info *nmcard_list; @@ -1275,6 +1276,8 @@ nm256_probe(struct pci_dev *pcidev,const struct pci_device_id *pciid) return nm256_install(pcidev, REV_NM256AV, "256AV"); if (pcidev->device == PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO) return nm256_install(pcidev, REV_NM256ZX, "256ZX"); + if (pcidev->device == PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO) + return nm256_install(pcidev, REV_NM256ZX, "256XL+"); return -1; /* should not come here ... */ } @@ -1662,6 +1665,8 @@ static struct pci_device_id nm256_pci_tbl[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0}, {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0}, + {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO, + PCI_ANY_ID, PCI_ANY_ID, 0, 0}, {0,} }; MODULE_DEVICE_TABLE(pci, nm256_pci_tbl); diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 6947d84ca52d18..8a2fa86aa2caca 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c @@ -275,11 +275,15 @@ struct snd_nm256 { #ifndef PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO #define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006 #endif +#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO +#define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016 +#endif static struct pci_device_id snd_nm256_ids[] = { {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {0,}, }; @@ -1591,6 +1595,9 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci, case PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO: strcpy(card->driver, "NM256ZX"); break; + case PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO: + strcpy(card->driver, "NM256XL+"); + break; default: snd_printk("invalid device id 0x%x\n", pci->device); snd_card_free(card); |