5 files changed, 10 insertions, 7 deletions
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h
index cfa52c1b0..66edc7fd8 100644
--- a/linux/drivers/media/video/bttvp.h
+++ b/linux/drivers/media/video/bttvp.h
@@ -25,7 +25,7 @@
 #define _BTTVP_H_
 
 #include <linux/version.h>
-#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,14)
+#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,15)
 
 #include <linux/types.h>
 #include <linux/wait.h>
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index f7fd2eefe..628fdfe99 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -49,7 +49,7 @@
 #include "cx88-reg.h"
 
 #include <linux/version.h>
-#define CX88_VERSION_CODE KERNEL_VERSION(0,0,3)
+#define CX88_VERSION_CODE KERNEL_VERSION(0,0,4)
 
 #ifndef TRUE
 # define TRUE (1==1)
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index e4fa8713b..831cd283e 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -19,7 +19,7 @@
  */
 
 #include <linux/version.h>
-#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,11)
+#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,12)
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
diff --git a/v4l/Makefile b/v4l/Makefile
index 9df6f7a56..829d88598 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -46,6 +46,9 @@ endif
 ifeq ($(CONFIG_VIDEO_IR),m)
   EXTRA_CFLAGS	+= -DCONFIG_VIDEO_IR=1
   saa7134-objs	+= saa7134-input.o
+  ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+    obj-$(CONFIG_VIDEO_IR)	+= ir-kbd-i2c.o 
+  endif
 endif
 
 
diff --git a/v4l/scripts/release.sh b/v4l/scripts/release.sh
index 6c9ea2bbd..557172875 100644
--- a/v4l/scripts/release.sh
+++ b/v4l/scripts/release.sh
@@ -2,9 +2,9 @@
 
 # config
 release="$HOME/kernel/release"
-ver_bt="0.9.14"
-ver_sa="0.2.11"
-ver_cx="0.0.3"
+ver_bt="0.9.15"
+ver_sa="0.2.12"
+ver_cx="0.0.4"
 
 # common files
 files_v4l="v4l*.[ch] video-buf.[ch] videodev*.h"
@@ -17,7 +17,7 @@ files_ir="ir-common.[ch]"
 files_audio="msp3400.[ch] tvaudio.[ch] tvmixer.[ch]"
 
 files_bttv="bt848.h btcx*.[ch] bttv*.[ch] bt832.[ch] ir-kbd*.c"
-files_saa="saa7134*.[ch] saa6752hs.[ch]"
+files_saa="saa7134*.[ch] saa6752hs.[ch] ir-kbd-i2c.c"
 files_cx="btcx*.[ch] cx*.[ch]"