diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-19 07:38:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-19 07:38:16 +0100 |
| commit | 8d11c6d9b14f7a87f65529cb33edc5fed846ed9d (patch) | |
| tree | 9f79b9a6144759c1fcb573c1ee3de77653ad19ae /include/linux/iio/adc | |
| parent | d0fc93f462b93983b73815e30c478a8d64d0ef68 (diff) | |
| parent | b401b621758e46812da61fa58a67c3fd8d91de0d (diff) | |
| download | linux-next-8d11c6d9b14f7a87f65529cb33edc5fed846ed9d.tar.gz linux-next-8d11c6d9b14f7a87f65529cb33edc5fed846ed9d.zip | |
Merge 6.8-rc5 into char-misc-next
We need the iio fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/iio/adc')
| -rw-r--r-- | include/linux/iio/adc/ad_sigma_delta.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h index 7852f6c9a714..719cf9cc6e1a 100644 --- a/include/linux/iio/adc/ad_sigma_delta.h +++ b/include/linux/iio/adc/ad_sigma_delta.h @@ -8,6 +8,8 @@ #ifndef __AD_SIGMA_DELTA_H__ #define __AD_SIGMA_DELTA_H__ +#include <linux/iio/iio.h> + enum ad_sigma_delta_mode { AD_SD_MODE_CONTINUOUS = 0, AD_SD_MODE_SINGLE = 1, @@ -99,7 +101,7 @@ struct ad_sigma_delta { * 'rx_buf' is up to 32 bits per sample + 64 bit timestamp, * rounded to 16 bytes to take into account padding. */ - uint8_t tx_buf[4] ____cacheline_aligned; + uint8_t tx_buf[4] __aligned(IIO_DMA_MINALIGN); uint8_t rx_buf[16] __aligned(8); }; |