diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 09:18:11 +0200 |
commit | 43a3beb6da994549ec28a9f31727b997a025f958 (patch) | |
tree | 9fea6f7e2abd5ba7ce4d5f725a8ceed0a4e0ab80 /drivers/staging/iio/meter/ade7854-i2c.c | |
parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
parent | 68cf162a1af23c35db8e3b78659c99196c9882ff (diff) |
Merge branch 'staging-next' into Linux 3.1
This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/meter/ade7854-i2c.c')
-rw-r--r-- | drivers/staging/iio/meter/ade7854-i2c.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index dd723435340..cbca3fd8fcd 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -10,6 +10,7 @@ #include <linux/kernel.h> #include <linux/i2c.h> #include <linux/slab.h> +#include <linux/module.h> #include "../iio.h" #include "ade7854.h" |