Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 3 insertions, 8 deletions

diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index 3bfca7c59baf..05aef8b97e96 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -37,7 +37,7 @@ static inline int snd_ad1816a_busy_wait(struct snd_ad1816a *chip)
                 if (inb(AD1816A_REG(AD1816A_CHIP_STATUS)) & AD1816A_READY)
                         return 0;
 
-        snd_printk("chip busy.\n");
+        snd_printk(KERN_WARNING "chip busy.\n");
         return -EBUSY;
 }
 
@@ -196,7 +196,7 @@ static int snd_ad1816a_trigger(struct snd_ad1816a *chip, unsigned char what,
                 spin_unlock(&chip->lock);
                 break;
         default:
-                snd_printk("invalid trigger mode 0x%x.\n", what);
+                snd_printk(KERN_WARNING "invalid trigger mode 0x%x.\n", what);
                 error = -EINVAL;
         }
 
@@ -377,7 +377,6 @@ static struct snd_pcm_hardware snd_ad1816a_capture = {
         .fifo_size =            0,
 };
 
-#if 0 /* not used now */
 static int snd_ad1816a_timer_close(struct snd_timer *timer)
 {
         struct snd_ad1816a *chip = snd_timer_chip(timer);
@@ -442,8 +441,6 @@ static struct snd_timer_hardware snd_ad1816a_timer_table = {
         .start =        snd_ad1816a_timer_start,
         .stop =         snd_ad1816a_timer_stop,
 };
-#endif /* not used now */
-
 
 static int snd_ad1816a_playback_open(struct snd_pcm_substream *substream)
 {
@@ -568,7 +565,7 @@ static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
         case AD1816A_HW_AD1815: return "AD1815";
         case AD1816A_HW_AD18MAX10: return "AD18max10";
         default:
-                snd_printk("Unknown chip version %d:%d.\n",
+                snd_printk(KERN_WARNING "Unknown chip version %d:%d.\n",
                         chip->version, chip->hardware);
                 return "AD1816A - unknown";
         }
@@ -687,7 +684,6 @@ int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_p
         return 0;
 }
 
-#if 0 /* not used now */
 int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd_timer **rtimer)
 {
         struct snd_timer *timer;
@@ -709,7 +705,6 @@ int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd
                 *rtimer = timer;
         return 0;
 }
-#endif /* not used now */
 
 /*
  *