linux-next: manual merge of the moduleh tree with the mmc tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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"
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/