Darren Salt wrote: >linux/include/media/ir-keymaps.h _defines_ some variables (as a header file, >it should only declare them) and is therefore misplaced and misnamed. It >should be linux/drivers/media/common/ir-keymaps.c. > >(The corresponding declarations exist in ir-common.h and, I think, should >stay there.) > >This patch contains the fixes which will be needed after this renaming. > > >Signed-off-by: Darren Salt <linux@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > >diff -u -r1.8 Makefile >--- a/linux/drivers/media/common/Makefile 26 Nov 2005 23:46:56 -0000 1.8 >+++ b/linux/drivers/media/common/Makefile 17 Jan 2006 19:22:37 -0000 >@@ -3,4 +3,4 @@ > > obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o > obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o >-obj-$(CONFIG_VIDEO_IR) += ir-common.o >+obj-$(CONFIG_VIDEO_IR) += ir-common.o ir-keymaps.o >diff -u -r1.19 ir-common.c >--- a/linux/drivers/media/common/ir-common.c 17 Jan 2006 16:18:40 -0000 1.19 >+++ a/linux/drivers/media/common/ir-common.c 17 Jan 2006 19:24:25 -0000 >@@ -26,7 +26,6 @@ > #include <linux/moduleparam.h> > #include <linux/string.h> > #include <media/ir-common.h> >-#include <media/ir-keymaps.h> > > /* -------------------------------------------------------------------------- */ > > > > Darren- Wow... you certainly didnt waste any time..... ;-) Yes, you're correct... For a moment there, cvs was wrong, just as you said... Mauro and I noticed it, and Ricardo fixed it right away...... CVS was only in that state for a few minutes, I guess you checked it out at that very moment. Anyhow, your patch (above) is a moot point right now... Things are already exactly as they should be. Thanks for noticing the problem though. :-) On another note, this would have reached us a bit quicker had you written to the video4linux mailing list instead. From a quick glance, it doesnt look to me as if DVB is using ir-common (yet) at all ... ...to be continued.
