iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.17-rc6 into staging-next.

Browse Source 
We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2014-09-22 07:30:03 -07:00
parent 3f76a4ea53 0f33be009b
commit d84a2b0d6f
167 changed files with 1078 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/adc/xilinx-xadc-core.c
View File

@ -1126,7 +1126,7 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np,
chan->address = XADC_REG_VPVN;
} else {
chan->scan_index = 15 + reg;
chan->scan_index = XADC_REG_VAUX(reg - 1);
chan->address = XADC_REG_VAUX(reg - 1);
}
num_channels++;
chan++;