Merge tag 'usb-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / drivers / iio / adc / ad7292.c

diff --git a/drivers/iio/adc/ad7292.c b/drivers/iio/adc/ad7292.c
index 3271a31..92c68d4 100644 (file)
--- a/drivers/iio/adc/ad7292.c
+++ b/drivers/iio/adc/ad7292.c
@@ -80,7 +80,7 @@ struct ad7292_state {
        struct regulator *reg;
        unsigned short vref_mv;
 
-       __be16 d16 ____cacheline_aligned;
+       __be16 d16 __aligned(IIO_DMA_MINALIGN);
        u8 d8[2];
 };