patch-2.1.102 linux/drivers/sound/sound_config.h

Next file: linux/drivers/sound/sound_syms.c
Previous file: linux/drivers/sound/softoss_rs.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.101/linux/drivers/sound/sound_config.h linux/drivers/sound/sound_config.h
@@ -10,14 +10,18 @@
  * for more info.
  */
 
-#include <linux/fs.h>
-#include "local.h.master"
+
+#ifndef  _SOUND_CONFIG_H_
+#define  _SOUND_CONFIG_H_
+
 #include <linux/config.h>
+#include <linux/fs.h>
+
+#include "legacy.h"
 #include "os.h"
 #include "soundvers.h"
 
 
-
 #ifndef SND_DEFAULT_ENABLE
 #define SND_DEFAULT_ENABLE	1
 #endif
@@ -181,3 +185,5 @@
 
 #define TIMER_ARMED	121234
 #define TIMER_NOT_ARMED	1
+
+#endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov