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 Salt | nr. Ashington, | d youmustbejoking,demon,co,uk | Debian, | Northumberland | s zap,tartarus,org | RISC OS | Toon Army | @ Say NO to UK ID cards | http://www.no2id.net/ Surly grammarians insist that all words ending in "ly" are adverbs.
