Messages in this thread Patch in this message | | | Date | Tue, 4 Oct 2011 17:57:24 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the moduleh tree with the tree |
| |
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in drivers/staging/iio/industrialio-ring.c between commit 14555b14455f ("staging:iio: replacing term ring with buffer in the IIO core") from the staging tree and commit 4903058fe223 ("staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh tree.
The former renamed the file modified by the latter. The new file is drivers/staging/iio/industrialio-buffer.c and will need to include export.h.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 4 Oct 2011 17:48:56 +1100 Subject: [PATCH] staging: Add export.h for EXPORT_SYMBOL to drivers/staging/iio/industrialio-buffer.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/staging/iio/industrialio-buffer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/iio/industrialio-buffer.c b/drivers/staging/iio/industrialio-buffer.c index 4ce101a..628aa69 100644 --- a/drivers/staging/iio/industrialio-buffer.c +++ b/drivers/staging/iio/industrialio-buffer.c @@ -14,6 +14,7 @@ * - Alternative access techniques? */ #include <linux/kernel.h> +#include <linux/export.h> #include <linux/device.h> #include <linux/fs.h> #include <linux/cdev.h> -- 1.7.6.3
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |