linux-next: manual merge of the staging-next tree with the v4l-dvb tree

Stephen Rothwell
2010-07-28T05:27:40Z

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/Kconfig between commit
44d349d2b19019e0b5912bc4e6c8531e50b394aa ("V4L/DVB: staging/lirc: wire up
Kconfig and Makefile bits") from the v4l-dvb tree and several commits
from the staging-next tree.

Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/Kconfig
index 0e4122e,6796265..0000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -145,7 -149,13 +147,15 @@@ source "drivers/staging/mrst-touchscree

source "drivers/staging/msm/Kconfig"

+source "drivers/staging/lirc/Kconfig"
+
+ source "drivers/staging/easycap/Kconfig"
+
+ source "drivers/staging/solo6x10/Kconfig"
+
+ source "drivers/staging/tidspbridge/Kconfig"
+
+ source "drivers/staging/quickstart/Kconfig"
+
endif # !STAGING_EXCLUDE_BUILD
endif # STAGING