quoted

Due to a collission with Linus sources I had to change the value of this
define to 19 in include/linux/videodev.h for the merge.

And you'll continue to get collisions until you submit me a patch to add it
to the master set 8)

Has Ralf already done this or should I do it?

- Ulf