lkml.org 
[lkml]   [2011]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the moduleh tree with the mfd tree
Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/mfd/twl6030-irq.c between commit 2b8af0825999 ("mfd: Fix twl6030
lockdep recursion warning on setting wake IRQs") from the mfd tree and
commit c86747746435 ("mfd: Add export.h for EXPORT_SYMBOL/THIS_MODULE as
required") from the moduleh tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/mfd/twl6030-irq.c
index deec3ec,b57383b..0000000
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@@ -37,7 -37,7 +37,8 @@@
#include <linux/kthread.h>
#include <linux/i2c/twl.h>
#include <linux/platform_device.h>
+#include <linux/suspend.h>
+ #include <linux/export.h>

#include "twl-core.h"

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-10-05 09:39    [W:0.203 / U:1.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site