fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / oss / pss.c

diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index c5d2ab0..ece428b 100644 (file)
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -1,5 +1,5 @@
 /*
- * sound/pss.c
+ * sound/oss/pss.c
  *
  * The low level driver for the Personal Sound System (ECHO ESC614).
  *
@@ -57,7 +57,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
@@ -714,7 +713,7 @@ static int __init attach_pss(struct address_info *hw_config)
         
        disable_all_emulations();
 
-#if YOU_REALLY_WANT_TO_ALLOCATE_THESE_RESOURCES
+#ifdef YOU_REALLY_WANT_TO_ALLOCATE_THESE_RESOURCES
        if (sound_alloc_dma(hw_config->dma, "PSS"))
        {
                printk("pss.c: Can't allocate DMA channel.\n");
@@ -1149,7 +1148,7 @@ static int mss_irq __initdata     = -1;
 static int mss_dma __initdata  = -1;
 static int mpu_io __initdata   = -1;
 static int mpu_irq __initdata  = -1;
-static int pss_no_sound __initdata = 0;        /* Just configure non-sound components */
+static int pss_no_sound = 0;   /* Just configure non-sound components */
 static int pss_keep_settings  = 1;     /* Keep hardware settings at module exit */
 static char *pss_firmware = "/etc/sound/pss_synth";