diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-29 14:19:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-29 14:19:32 +1000 |
| commit | 173a1caceaa301720d2d0521ec282c7d9b4d664b (patch) | |
| tree | b5bdf625e472ee8679ea866f2aa77e8020d370a6 /drivers/staging/iio/accel/adis16209_ring.c | |
| parent | 4282a20a1d2e5c1be92d839c9baa4671123b4349 (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
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> |