Changeset 717 for GPL/trunk/alsa-kernel/pci/trident/trident.h

Timestamp:

Aug 7, 2022, 6:11:12 PM (3 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/trident/trident.h (modified) (2 diffs)

GPL/trunk/alsa-kernel/pci/trident/trident.h

@@ -252 +252 @@
         __le32 *entries;                /* 16k-aligned TLB table */
         dma_addr_t entries_dmaaddr;     /* 16k-aligned PCI address to TLB table */
-        struct snd_dma_buffer buffer;
+        struct snd_dma_buffer *buffer;
         struct snd_util_memhdr * memhdr;        /* page allocation list */
-        struct snd_dma_buffer silent_page;
+        struct snd_dma_buffer *silent_page;
 };
 
@@ -401 +401 @@
                        int pcm_streams,
                        int pcm_spdif_device,
-                       int max_wavetable_size,
-                       struct snd_trident ** rtrident);
+                       int max_wavetable_size);
 int snd_trident_create_gameport(struct snd_trident *trident);