vserver 1.9.5.x5

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

diff --git a/sound/oss/aci.c b/sound/oss/aci.c
index ac3c481..3928c28 100644 (file)
--- a/sound/oss/aci.c
+++ b/sound/oss/aci.c
@@ -62,11 +62,10 @@
 #include "sound_config.h"
 
 int aci_port;  /* as determined by bit 4 in the OPTi 929 MC4 register */
-int aci_idcode[2];     /* manufacturer and product ID */
+static int aci_idcode[2];      /* manufacturer and product ID */
 int aci_version;       /* ACI firmware version */
 
 EXPORT_SYMBOL(aci_port);
-EXPORT_SYMBOL(aci_idcode);
 EXPORT_SYMBOL(aci_version);
 
 #include "aci.h"
@@ -84,22 +83,22 @@ static struct semaphore aci_sem;
 
 #ifdef MODULE
 static int reset;
-MODULE_PARM(reset,"i");
+module_param(reset, bool, 0);
 MODULE_PARM_DESC(reset,"When set to 1, reset aci mixer.");
 #else
 static int reset = 1;
 #endif
 
 static int ide=-1;
-MODULE_PARM(ide,"i");
+module_param(ide, int, 0);
 MODULE_PARM_DESC(ide,"1 enable, 0 disable ide-port - untested"
                 " default: do nothing");
 static int wss=-1;
-MODULE_PARM(wss,"i");
+module_param(wss, int, 0);
 MODULE_PARM_DESC(wss,"change between ACI/WSS-mixer; use 0 and 1 - untested"
                 " default: do nothing; for PCM1-pro only");
 
-#if DEBUG
+#ifdef DEBUG
 static void print_bits(unsigned char c)
 {
        int j;
@@ -184,7 +183,7 @@ static int busy_wait(void)
 static inline int aci_rawwrite(unsigned char byte)
 {
        if (busy_wait() >= 0) {
-#if DEBUG
+#ifdef DEBUG
                printk(KERN_DEBUG "aci_rawwrite(%d)\n", byte);
 #endif
                outb(byte, COMMAND_REGISTER);
@@ -199,7 +198,7 @@ static inline int aci_rawread(void)
 
        if (busy_wait() >= 0) {
                byte=inb(STATUS_REGISTER);
-#if DEBUG
+#ifdef DEBUG
                printk(KERN_DEBUG "%d = aci_rawread()\n", byte);
 #endif
                return byte;