linux-next: manual merge of the tip tree with the sh tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/Makefile between commit ae9b12c72f831a2f956a5b30fd999f3018c43a89
("dmaengine: initialise DMA engine before MMC") from the sh tree and
commit 592913ecb87a9e06f98ddb55b298f1a66bf94c6b ("time: Kill off
CONFIG_GENERIC_TIME") from the tip tree.

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

diff --cc drivers/Makefile
index 20dcced,ae47344..0000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -102,7 -101,10 +102,9 @@@ obj-y				+= firmware
  obj-$(CONFIG_CRYPTO)		+= crypto/
  obj-$(CONFIG_SUPERH)		+= sh/
  obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/
- obj-$(CONFIG_GENERIC_TIME)	+= clocksource/
+ ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
+ obj-y				+= clocksource/
+ endif
 -obj-$(CONFIG_DMA_ENGINE)	+= dma/
  obj-$(CONFIG_DCA)		+= dca/
  obj-$(CONFIG_HID)		+= hid/
  obj-$(CONFIG_PPC_PS3)		+= ps3/
--
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/