* linux-next: manual merge of the moduleh tree with the mmc tree
@ 2011-09-23 5:03 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-09-23 5:03 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Adrian Hunter, Chris Ball
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/mmc/host/sdhci-pci.c between commit 28f7cbd110e0 ("mmc:
sdhci-pci: add eMMC hardware reset support") from the mmc tree and commit
a93136688a2e ("mmc: Add module.h to drivers/mmc users assuming implicit
presence") from the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
[Chris: Of course, this file should be including module.h anyway ...]
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/mmc/host/sdhci-pci.c
index 3b30c51,2551326..0000000
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@@ -21,8 -21,7 +21,9 @@@
#include <linux/mmc/host.h>
#include <linux/scatterlist.h>
#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/sfi.h>
+ #include <linux/module.h>
#include "sdhci.h"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-09-23 5:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-23 5:03 linux-next: manual merge of the moduleh tree with the mmc tree Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.