vserver 1.9.5.x5

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

diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index c78a5a1..4384dac 100644 (file)
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -123,9 +123,9 @@ ad1848_port_info;
 static struct address_info cfg;
 static int nr_ad1848_devs;
 
-int deskpro_xl;
-int deskpro_m;
-int soundpro;
+static int deskpro_xl;
+static int deskpro_m;
+static int soundpro;
 
 static volatile signed char irq2dev[17] = {
        -1, -1, -1, -1, -1, -1, -1, -1,
@@ -2905,24 +2905,24 @@ static int __initdata dma = -1;
 static int __initdata dma2 = -1;
 static int __initdata type = 0;
 
-MODULE_PARM(io, "i");                   /* I/O for a raw AD1848 card */
-MODULE_PARM(irq, "i");                  /* IRQ to use */
-MODULE_PARM(dma, "i");                  /* First DMA channel */
-MODULE_PARM(dma2, "i");                 /* Second DMA channel */
-MODULE_PARM(type, "i");                 /* Card type */
-MODULE_PARM(deskpro_xl, "i");           /* Special magic for Deskpro XL boxen */
-MODULE_PARM(deskpro_m, "i");            /* Special magic for Deskpro M box */
-MODULE_PARM(soundpro, "i");             /* More special magic for SoundPro chips */
+module_param(io, int, 0);              /* I/O for a raw AD1848 card */
+module_param(irq, int, 0);             /* IRQ to use */
+module_param(dma, int, 0);             /* First DMA channel */
+module_param(dma2, int, 0);            /* Second DMA channel */
+module_param(type, int, 0);            /* Card type */
+module_param(deskpro_xl, bool, 0);     /* Special magic for Deskpro XL boxen */
+module_param(deskpro_m, bool, 0);      /* Special magic for Deskpro M box */
+module_param(soundpro, bool, 0);       /* More special magic for SoundPro chips */
 
 #ifdef CONFIG_PNP
-MODULE_PARM(isapnp,    "i");
-MODULE_PARM(isapnpjump,        "i");
-MODULE_PARM(reverse,   "i");
+module_param(isapnp, int, 0);
+module_param(isapnpjump, int, 0);
+module_param(reverse, bool, 0);
 MODULE_PARM_DESC(isapnp,       "When set to 0, Plug & Play support will be disabled");
 MODULE_PARM_DESC(isapnpjump,   "Jumps to a specific slot in the driver's PnP table. Use the source, Luke.");
 MODULE_PARM_DESC(reverse,      "When set to 1, will reverse ISAPnP search order");
 
-struct pnp_dev *ad1848_dev  = NULL;
+static struct pnp_dev  *ad1848_dev  = NULL;
 
 /* Please add new entries at the end of the table */
 static struct {