lkml.org 
[lkml]   [2011]   [Sep]   [23]   [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 mmc tree
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"



\
 
 \ /
  Last update: 2011-09-23 07:05    [W:0.176 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site