Merge branch 'viro'

[linux-2.6] / sound / oss / i810_audio.c

diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index 4600cd6742ceaca0c397efd42fcc8d9ef01f852b..abc242abd5b111ba5dea82c2d51889a26a9a45b6 100644 (file)
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -312,7 +312,8 @@ static struct pci_device_id i810_pci_tbl [] = {
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_18,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4},
-
+       {PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_AUDIO,
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
        {0,}
 };
 
@@ -3427,7 +3428,6 @@ out_iospace:
                release_mem_region(card->ac97base_mmio_phys, 512);
                release_mem_region(card->iobase_mmio_phys, 256);
        }
-out_pio:       
        release_region(card->ac97base, 256);
 out_region2:
        release_region(card->iobase, 64);