2009-09-02 02:17:17

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree

---

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/gspca/Kconfig between commit
b6b85048c059e3f085095e48e12ed3f7a92c88d4 ("V4L/DVB (12502): gspca -
sn9c20x: Fix gscpa sn9c20x build errors") from Linus' tree and commit
7b5ab5558fbce09584d8795bc91eb64d8c685782 ("V4L/DVB (12452):
gspca/Kconfig: Fix bad identation for USB_GSPCA_SN9C20X_EVDEV") from the
v4l-dvb tree.

I fixed it up (see below) and will carry the fix for a while.
--
Cheers,
Stephen Rothwell [email protected]

diff --cc drivers/media/video/gspca/Kconfig
index e994dca,6ae1522..0000000
--- a/drivers/media/video/gspca/Kconfig
+++ b/drivers/media/video/gspca/Kconfig
@@@ -113,10 -122,10 +122,10 @@@ config USB_GSPCA_SN9C20
module will be called gspca_sn9c20x.

config USB_GSPCA_SN9C20X_EVDEV
- bool "Enable evdev support"
+ bool "Enable evdev support"
- depends on USB_GSPCA_SN9C20X
+ depends on USB_GSPCA_SN9C20X && INPUT
- ---help---
- Say Y here in order to enable evdev support for sn9c20x webcam button.
+ ---help---
+ Say Y here in order to enable evdev support for sn9c20x webcam button.

config USB_GSPCA_SONIXB
tristate "SONIX Bayer USB Camera Driver"

2009-09-03 02:12:24

by Mauro Carvalho Chehab

[permalink] [raw]

Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

---

Em Wed, 2 Sep 2009 12:17:13 +1000
Stephen Rothwell <[email protected]> escreveu:

> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/gspca/Kconfig between commit
> b6b85048c059e3f085095e48e12ed3f7a92c88d4 ("V4L/DVB (12502): gspca -
> sn9c20x: Fix gscpa sn9c20x build errors") from Linus' tree and commit
> 7b5ab5558fbce09584d8795bc91eb64d8c685782 ("V4L/DVB (12452):
> gspca/Kconfig: Fix bad identation for USB_GSPCA_SN9C20X_EVDEV") from the
> v4l-dvb tree.
>
> I fixed it up (see below) and will carry the fix for a while.

Thanks.

I've rebased it to fix this merge conflict between my devel tree and upstream.
You probably can drop it on your next merge.



Atenciosamente,
Prof. Mauro Carvalho Chehab, MSc, CISSP
[email protected]

2009-09-03 06:49:09

by Stephen Rothwell

[permalink] [raw]

Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

---

Hi Mauro,

On Wed, 2 Sep 2009 23:12:14 -0300 Mauro Carvalho Chehab <[email protected]> wrote:
>
> I've rebased it to fix this merge conflict between my devel tree and upstream.
> You probably can drop it on your next merge.

Thanks.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

---

Attachments:

(No filename) (341.00 B)
(No filename) (197.00 B)
Download all attachments