diff options
Diffstat (limited to 'sound/oss/ad1848.c')
| -rw-r--r-- | sound/oss/ad1848.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 8a197fd3c57..ec1ee07df59 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c @@ -50,8 +50,6 @@ #include <linux/pnp.h> #include <linux/spinlock.h> -#define DEB(x) -#define DEB1(x) #include "sound_config.h" #include "ad1848.h" @@ -119,9 +117,9 @@ ad1848_port_info; static struct address_info cfg; static int nr_ad1848_devs; -static int deskpro_xl; -static int deskpro_m; -static int soundpro; +static bool deskpro_xl; +static bool deskpro_m; +static bool soundpro; static volatile signed char irq2dev[17] = { -1, -1, -1, -1, -1, -1, -1, -1, @@ -177,7 +175,7 @@ static struct { #ifdef CONFIG_PNP static int isapnp = 1; static int isapnpjump; -static int reverse; +static bool reverse; static int audio_activated; #else @@ -1016,8 +1014,6 @@ static void ad1848_close(int dev) ad1848_info *devc = (ad1848_info *) audio_devs[dev]->devc; ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]->portc; - DEB(printk("ad1848_close(void)\n")); - devc->intr_active = 0; ad1848_halt(dev); @@ -2864,7 +2860,7 @@ static struct { {NULL} }; -static struct isapnp_device_id id_table[] __devinitdata = { +static struct isapnp_device_id id_table[] = { { ISAPNP_VENDOR('C','M','I'), ISAPNP_DEVICE(0x0001), ISAPNP_VENDOR('@','@','@'), ISAPNP_FUNCTION(0x0001), 0 }, { ISAPNP_ANY_ID, ISAPNP_ANY_ID, |