diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-06 23:01:20 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-06 23:01:20 (GMT) |
| commit | b600c5b569c2f62eacf8d71dd9975d7a996073f3 (patch) | |
| tree | 4b16b0ada1c7a732fc04518ecdd2d6c97512729f /drivers/staging/iio/adc/ad7793.c | |
| parent | c14d1769ba81ed084adb450d2fa1bacaee3cd2c7 (diff) | |
| parent | 06d5199d4c53615338d0453b62458cd82fb88f33 (diff) | |
| download | linux-fsl-qoriq-b600c5b569c2f62eacf8d71dd9975d7a996073f3.tar.xz | |
Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Diffstat (limited to 'drivers/staging/iio/adc/ad7793.c')
| -rw-r--r-- | drivers/staging/iio/adc/ad7793.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c index 2bb9f68..eaa0cc9 100644 --- a/drivers/staging/iio/adc/ad7793.c +++ b/drivers/staging/iio/adc/ad7793.c @@ -758,7 +758,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = { .address = AD7793_CH_AIN1M_AIN1M, .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | IIO_CHAN_INFO_SCALE_SHARED_BIT, - .scan_index = 2, + .scan_index = 3, .scan_type = IIO_ST('s', 24, 32, 0) }, .channel[4] = { @@ -831,7 +831,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = { .address = AD7793_CH_AIN1M_AIN1M, .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | IIO_CHAN_INFO_SCALE_SHARED_BIT, - .scan_index = 2, + .scan_index = 3, .scan_type = IIO_ST('s', 16, 32, 0) }, .channel[4] = { |