diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-06 17:43:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-06 17:43:06 +1000 |
| commit | 1f1c64b0b0875797ac40f93094149afdb64a11a5 (patch) | |
| tree | 24f18b3c9c0516d9848dc54b804d564ab29e4776 /drivers/staging/iio/accel/adis16209_ring.c | |
| parent | a26ab3967c5906f96f09aa371fb731060e7cac75 (diff) | |
| parent | 12513b76a021e5b41a9d5d5981da75dfd6480890 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/cx25821/cx25821-audups11.c
Diffstat (limited to 'drivers/staging/iio/accel/adis16209_ring.c')
| -rw-r--r-- | drivers/staging/iio/accel/adis16209_ring.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c index 533e28574910..8959ad85bbac 100644 --- a/drivers/staging/iio/accel/adis16209_ring.c +++ b/drivers/staging/iio/accel/adis16209_ring.c @@ -6,6 +6,7 @@ #include <linux/device.h> #include <linux/kernel.h> #include <linux/spi/spi.h> +#include <linux/slab.h> #include <linux/sysfs.h> #include <linux/list.h> |