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

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
sound/soc/soc-io.c between commit be3ea3b9e8df ("ASoC: Use new register
map API for ASoC generic physical I/O") from the sound tree and commit
1aff9ab90466 ("sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where
needed") from the moduleh tree.

I fixed it up (see below) and can carry the fix as necessary.

[Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> was left off the cc list
because his host is not reolving in the DNS currently.]
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc sound/soc/soc-io.c
index 66fcccd,963efe0..0000000
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@@ -13,7 -13,7 +13,8 @@@
  
  #include <linux/i2c.h>
  #include <linux/spi/spi.h>
 +#include <linux/regmap.h>
+ #include <linux/export.h>
  #include <sound/soc.h>
  
  #include <trace/events/asoc.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/