From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Aug 2012 06:06:10 +0000 (+1000)
Subject: Merge remote-tracking branch 'staging/staging-next'
X-Git-Tag: next-20120824~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=41e993f14a6e5f68c1cdfc898362b7737d1857b2;p=karo-tx-linux.git

Merge remote-tracking branch 'staging/staging-next'
---

41e993f14a6e5f68c1cdfc898362b7737d1857b2
diff --cc drivers/staging/iio/adc/ad7192.c
index 095837285f4f,e381d4b5a6ed..405d9a8d7b6d
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@@ -969,9 -965,9 +969,9 @@@ static const struct iio_info ad7195_inf
  	  IIO_CHAN_INFO_SCALE_SEPARATE_BIT,				\
  	  .address = _address,						\
  	  .scan_index = _si,						\
 -	  .scan_type =  IIO_ST('s', 24, 32, 0)}
 +	  .scan_type =  IIO_ST('u', 24, 32, 0)}
  
- static struct iio_chan_spec ad7192_channels[] = {
+ static const struct iio_chan_spec ad7192_channels[] = {
  	AD7192_CHAN_DIFF(1, 2, NULL, AD7192_CH_AIN1P_AIN2M, 0),
  	AD7192_CHAN_DIFF(3, 4, NULL, AD7192_CH_AIN3P_AIN4M, 1),
  	AD7192_CHAN_TEMP(0, AD7192_CH_TEMP, 2),