--- kernel-2.6.27.orig/drivers/media/video/Kconfig
+++ kernel-2.6.27/drivers/media/video/Kconfig
@@ -295,6 +295,60 @@
 	  This is a driver for the Toshiba TCM825x VGA camera sensor.
 	  It is used for example in Nokia N800.
 
+config VIDEO_ET8EK8
+	tristate "ET8EK8 camera sensor support"
+	depends on I2C && VIDEO_V4L2
+	select VIDEO_SMIAREGS
+	---help---
+	  This is a driver for the Toshiba ET8EK8 5 MP camera sensor.
+	  It is used for example in Nokia RX51.
+
+config VIDEO_MT9P012
+	tristate "MT9P012 camera sensor support"
+	depends on I2C && VIDEO_V4L2
+	select VIDEO_SMIAREGS
+	---help---
+	  This is a driver for the Micron MT9P012 5 MP camera sensor.
+	  It is used for example in Nokia RX51.
+
+config VIDEO_AD5820
+	tristate "AD5820 lens voice coil support"
+	depends on I2C && VIDEO_V4L2
+	---help---
+	  This is a driver for the AD5820 camera lens voice coil.
+	  It is used for example in Nokia RX51.
+
+config VIDEO_ADP1653
+	tristate "ADP1653 flash support"
+	depends on I2C && VIDEO_V4L2
+	---help---
+	  This is a driver for the ADP1653 flash.  It is used for
+	  example in Nokia RX51.
+
+config VIDEO_VS6555
+	tristate "VS6555 camera sensor support"
+	depends on I2C && VIDEO_V4L2
+	select VIDEO_SMIAREGS
+	---help---
+	  This is a driver for the ST VS6555 VGA camera sensor.
+	  It is used for example in Nokia RX51.
+
+config VIDEO_TCM8330MD
+	tristate "TCM8330MD camera sensor support"
+	depends on I2C && VIDEO_V4L2
+	select VIDEO_SMIAREGS
+	---help---
+	  This is a driver for the Toshiba tcm8330md VGA camera sensor.
+	  It is used for example in Nokia RX51.
+
+config VIDEO_OV9640
+	tristate "OmniVision OV9640 sensor support"
+	depends on I2C && VIDEO_V4L2
+	---help---
+	  This is a Video4Linux2 sensor-level driver for the OmniVision
+	  OV9640 camera.  It is currently working with the TI OMAP2
+	  camera controller.
+
 config VIDEO_SAA7110
 	tristate "Philips SAA7110 video decoder"
 	depends on VIDEO_V4L1 && I2C
@@ -754,6 +808,8 @@
 
 source "drivers/media/video/ivtv/Kconfig"
 
+source drivers/media/video/omap/Kconfig
+
 source "drivers/media/video/cx18/Kconfig"
 
 config VIDEO_M32R_AR
@@ -784,6 +840,33 @@
 	  CMOS camera controller.  This is the controller found on first-
 	  generation OLPC systems.
 
+config VIDEO_OMAP3
+        tristate "OMAP 3 Camera support"
+	select VIDEOBUF_GEN
+	select VIDEOBUF_DMA_SG
+	depends on VIDEO_V4L2 && ARCH_OMAP34XX
+	---help---
+	  Driver for an OMAP 3 camera controller.
+
+config VIDEO_SMIAREGS
+	tristate "Generic SMIA I2C register access and register list helper"
+	depends on I2C
+	---help---
+	  This allows writing and reading SMIA image sensors' I2C registers
+	  easily.
+
+	  Also a few helper functions are provided to work with binary
+	  register lists.
+
+config VIDEO_OMAP2
+	tristate "OMAP 2 Camera support (EXPERIMENTAL)"
+	select VIDEOBUF_GEN
+	select VIDEOBUF_DMA_SG
+	depends on VIDEO_V4L2 && ARCH_OMAP24XX
+	---help---
+	  Driver for an OMAP 2 camera controller.
+
+
 #
 # USB Multimedia device configuration
 #