[PATCH] ALSA patch for 2.5.6pre2

Hello,

	this recent ALSA patch includes:

- added initial version of Config.help files
- moved /proc/asound/sndstat to /proc/asound/oss/sndstat
- moved /proc/asound/oss-devices to /proc/asound/oss/devices
- snd-rtctimer updates (blocking of RTC driver change)
- added ioctl conversion code for 32-bit applications running on 64-bit kernels
- fixed dependencies in makefiles
- wavefront driver cleanups (removed LOOPS_PER_SEC)
- created Documentation/sound/alsa directory

						Jaroslav

6 files changed, 12 insertions, 11 deletions

diff --git a/include/sound/core.h b/include/sound/core.h
index 5744cdd5cc8e..94590bff56fb 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef CONFIG_PM
+#include <linux/sched.h>		/* wake_up() and struct semaphore */
+#endif
+
 /* Typedef's */
 typedef struct timeval snd_timestamp_t;
 typedef struct sndrv_interval snd_interval_t;
diff --git a/include/sound/driver.h b/include/sound/driver.h
index ca4d4ab28e46..2fd88e2701b8 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -78,12 +78,4 @@ void snd_wrapper_vfree(void *);
 
 #include "sndmagic.h"
 
-/*
- * Temporary hack, until linux/init.h is fixed.
- */
-#include <linux/init.h>
-#ifndef __devexit_p
-#define __devexit_p(x) x
-#endif
-
 #endif /* __SOUND_DRIVER_H */
diff --git a/include/sound/info.h b/include/sound/info.h
index 98d58dad1495..ec841506e6db 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -104,6 +104,11 @@ extern int snd_info_minor_unregister(void);
 #ifdef CONFIG_PROC_FS
 
 extern snd_info_entry_t *snd_seq_root;
+#ifdef CONFIG_SND_OSSEMUL
+extern snd_info_entry_t *snd_oss_root;
+#else
+#define snd_oss_root NULL
+#endif
 
 int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3)));
 int snd_info_init(void);
@@ -138,6 +143,7 @@ void snd_remove_proc_entry(struct proc_dir_entry *parent,
 #else
 
 #define snd_seq_root NULL
+#define snd_oss_root NULL
 
 static inline int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...) { return 0; }
 static inline int snd_info_init(void) { return 0; }
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 3d24d3c04273..09653070905e 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -25,6 +25,7 @@
 
 #include <sound/asound.h>
 #include <linux/poll.h>
+#include <linux/bitops.h>
 
 typedef sndrv_pcm_uframes_t snd_pcm_uframes_t;
 typedef sndrv_pcm_sframes_t snd_pcm_sframes_t;
diff --git a/include/sound/pcm_params.h b/include/sound/pcm_params.h
index 9d008650e5f2..769d8738f2fd 100644
--- a/include/sound/pcm_params.h
+++ b/include/sound/pcm_params.h
@@ -22,8 +22,6 @@
  *
  */
 
-#include <linux/bitops.h>
-
 extern int snd_pcm_hw_param_mask(snd_pcm_substream_t *pcm, snd_pcm_hw_params_t *params,
 				 snd_pcm_hw_param_t var, const snd_mask_t *val);
 extern unsigned int snd_pcm_hw_param_value_min(const snd_pcm_hw_params_t *params,
diff --git a/include/sound/version.h b/include/sound/version.h
index 50a7e6f090d8..21ced3f5bc47 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated automatically by configure.  */
 #define CONFIG_SND_VERSION "0.9.0beta12"
-#define CONFIG_SND_DATE " (Tue Feb 26 09:34:24 2002 UTC)"
+#define CONFIG_SND_DATE " (Wed Mar 06 07:56:20 2002 UTC)"