[PATCH] 2.5.7 ALSA include fixes

Include fixes to allow ALSA to compile.

diff --git a/include/sound/asound.h b/include/sound/asound.h
index 3c7df6d5964916b549d436449af934fa6de46092..8ea3e38a656b6119dda37ef96d5aaa80d89374c2 100644 (file)
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -30,6 +30,7 @@
 #ifdef __KERNEL__
 
 #include <linux/types.h>
+#include <linux/time.h>
 #include <asm/byteorder.h>
 
 #if  __LITTLE_ENDIAN == 1234

diff --git a/include/sound/core.h b/include/sound/core.h
index 94590bff56fbcff0b1fc0ef7d3259a9055793dd8..4374ac83c750966660b612e8054d5410e1cd5e3a 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -252,6 +252,7 @@ void *snd_malloc_isa_pages_fallback(unsigned long size, dma_addr_t *dma_addr, un
 #define snd_free_isa_pages(size, ptr, dma_addr) snd_free_pages(ptr, size)
 #endif
 #ifdef CONFIG_PCI
+struct pci_dev;
 void *snd_malloc_pci_pages(struct pci_dev *pci, unsigned long size, dma_addr_t *dma_addr);
 void *snd_malloc_pci_pages_fallback(struct pci_dev *pci, unsigned long size, dma_addr_t *dma_addr, unsigned long *res_size);
 void snd_free_pci_pages(struct pci_dev *pci, unsigned long size, void *ptr, dma_addr_t dma_addr);

diff --git a/sound/core/device.c b/sound/core/device.c
index 39ee1570a14cbdcfe9f88d592b74ef7bcbf7de3c..031277e3db11c14f04c934aa977083d326c28eb7 100644 (file)
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <sound/core.h>
+#include <linux/errno.h>
 
 int snd_device_new(snd_card_t *card, snd_device_type_t type,
                   void *device_data, snd_device_ops_t *ops)

diff --git a/sound/core/memory.c b/sound/core/memory.c
index 25664f8bf664af2d1e706d1109acf8bcf334a311..6cc7093972e81cc49c44556b6efdb1cfa4925ff1 100644 (file)
--- a/sound/core/memory.c
+++ b/sound/core/memory.c
@@ -26,6 +26,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/time.h>
+#include <linux/pci.h>
 #include <sound/core.h>
 #include <sound/info.h>
 

diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index fe259ff683606e951cceffc7ab72ce35931dd45f..80c925cf92e64b0bc80bb6b9a25e74f071193c41 100644 (file)
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -20,6 +20,7 @@
 
 #include <sound/driver.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include "seq_clientmgr.h"
 #include <sound/initval.h>

diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index d451effca18f7b4ad31d0e3324d0c3e9ffa0bd2c..85f915ee50bb5e0e0d1ec1e49e80432f055cb1b5 100644 (file)
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -29,6 +29,8 @@ Possible options for midisynth module:
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/errno.h>
+#include <asm/semaphore.h>
 #include <sound/core.h>
 #include <sound/rawmidi.h>
 #include <sound/seq_kernel.h>

diff --git a/sound/core/seq/seq_midi_event.c b/sound/core/seq/seq_midi_event.c
index 7ebf0514b16b9c064d000027e45ed55a4d53916f..ccdb510492567c4ac0e4d89ffed424fa6fd52874 100644 (file)
--- a/sound/core/seq/seq_midi_event.c
+++ b/sound/core/seq/seq_midi_event.c
@@ -21,6 +21,7 @@
 
 #include <sound/driver.h>
 #include <linux/slab.h>
+#include <linux/errno.h>
 #include <sound/core.h>
 #include <sound/seq_kernel.h>
 #include <sound/seq_midi_event.h>

diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index b399150e2a6fcac715f0807f1a6f1aed52cc3cc8..aa7b7ab62844fac5cdd1bc467f5c6497796fbade 100644 (file)
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -29,6 +29,8 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
 #include <sound/core.h>
 #include <sound/mpu401.h>