Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/video/omap2/dss/rfbi.c between commit 24e6289c029b ("OMAP: DSS2:
remove extra includes from include/video/omapdss.h") from Linus' tree and
commit 06e632e042aa ("video: Add export.h for THIS_MODULE/EXPORT_SYMBOL
to drivers/video") from the moduleh tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/video/omap2/dss/rfbi.c
index 39f4c59,5dbd229..0000000
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@@ -33,8 -33,7 +33,9 @@@
#include <linux/hrtimer.h>
#include <linux/seq_file.h>
#include <linux/semaphore.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+ #include <linux/export.h>
#include <video/omapdss.h>
#include "dss.h"
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
