Merge branch 'next' into for-linus

[linux-2.6-omap-h63xx.git] / sound / pcmcia / vx / vxpocket.c

diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index d7df59e9c647e43b142f8215e4fac3386a0de196..706602a40600718666c3a5e5fb7e957dc901e622 100644 (file)
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -19,7 +19,6 @@
  */
 
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
@@ -91,7 +90,7 @@ static int snd_vxpocket_dev_free(struct snd_device *device)
  * Only output levels can be modified
  */
 
-static DECLARE_TLV_DB_SCALE(db_scale_old_vol, -11350, 50, 0);
+static const DECLARE_TLV_DB_SCALE(db_scale_old_vol, -11350, 50, 0);
 
 static struct snd_vx_hardware vxpocket_hw = {
        .name = "VXPocket",
@@ -297,7 +296,7 @@ static int vxpocket_probe(struct pcmcia_device *p_dev)
 
        /* find an empty slot from the card list */
        for (i = 0; i < SNDRV_CARDS; i++) {
-               if (! card_alloc & (1 << i))
+               if (!(card_alloc & (1 << i)))
                        break;
        }
        if (i >= SNDRV_CARDS) {