1 files changed, 58 insertions, 60 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3f945b0d52b8..1f6c9ee3afde 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -784,6 +784,64 @@ config VIDEO_CAFE_CCIC
           CMOS camera controller.  This is the controller found on first-
           generation OLPC systems.
 
+config SOC_CAMERA
+        tristate "SoC camera support"
+        depends on VIDEO_V4L2 && HAS_DMA
+        select VIDEOBUF_GEN
+        help
+          SoC Camera is a common API to several cameras, not connecting
+          over a bus like PCI or USB. For example some i2c camera connected
+          directly to the data bus of an SoC.
+
+config SOC_CAMERA_MT9M001
+        tristate "mt9m001 support"
+        depends on SOC_CAMERA && I2C
+        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
+        help
+          This driver supports MT9M001 cameras from Micron, monochrome
+          and colour models.
+
+config MT9M001_PCA9536_SWITCH
+        bool "pca9536 datawidth switch for mt9m001"
+        depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO
+        help
+          Select this if your MT9M001 camera uses a PCA9536 I2C GPIO
+          extender to switch between 8 and 10 bit datawidth modes
+
+config SOC_CAMERA_MT9V022
+        tristate "mt9v022 support"
+        depends on SOC_CAMERA && I2C
+        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
+        help
+          This driver supports MT9V022 cameras from Micron
+
+config MT9V022_PCA9536_SWITCH
+        bool "pca9536 datawidth switch for mt9v022"
+        depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO
+        help
+          Select this if your MT9V022 camera uses a PCA9536 I2C GPIO
+          extender to switch between 8 and 10 bit datawidth modes
+
+config SOC_CAMERA_PLATFORM
+        tristate "platform camera support"
+        depends on SOC_CAMERA
+        help
+          This is a generic SoC camera platform driver, useful for testing
+
+config VIDEO_PXA27x
+        tristate "PXA27x Quick Capture Interface driver"
+        depends on VIDEO_DEV && PXA27x && SOC_CAMERA
+        select VIDEOBUF_DMA_SG
+        ---help---
+          This is a v4l2 driver for the PXA27x Quick Capture Interface
+
+config VIDEO_SH_MOBILE_CEU
+        tristate "SuperH Mobile CEU Interface driver"
+        depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA
+        select VIDEOBUF_DMA_CONTIG
+        ---help---
+          This is a v4l2 driver for the SuperH Mobile CEU Interface
+
 #
 # USB Multimedia device configuration
 #
@@ -913,64 +971,4 @@ config USB_S2255
 
 endif # V4L_USB_DRIVERS
 
-config SOC_CAMERA
-        tristate "SoC camera support"
-        depends on VIDEO_V4L2 && HAS_DMA
-        select VIDEOBUF_GEN
-        help
-          SoC Camera is a common API to several cameras, not connecting
-          over a bus like PCI or USB. For example some i2c camera connected
-          directly to the data bus of an SoC.
-
-config SOC_CAMERA_MT9M001
-        tristate "mt9m001 support"
-        depends on SOC_CAMERA && I2C
-        select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
-        help
-          This driver supports MT9M001 cameras from Micron, monochrome
-          and colour models.
-
-config MT9M001_PCA9536_SWITCH
-        bool "pca9536 datawidth switch for mt9m001"
-        depends on SOC_CAMERA_MT9M001 && GENERIC_GPIO
-        help
-          Select this if your MT9M001 camera uses a PCA9536 I2C GPIO
-          extender to switch between 8 and 10 bit datawidth modes
-
-config SOC_CAMERA_MT9V022
-        tristate "mt9v022 support"
-        depends on SOC_CAMERA && I2C
-        select GPIO_PCA953X if MT9V022_PCA9536_SWITCH
-        help
-          This driver supports MT9V022 cameras from Micron
-
-config MT9V022_PCA9536_SWITCH
-        bool "pca9536 datawidth switch for mt9v022"
-        depends on SOC_CAMERA_MT9V022 && GENERIC_GPIO
-        help
-          Select this if your MT9V022 camera uses a PCA9536 I2C GPIO
-          extender to switch between 8 and 10 bit datawidth modes
-
-config SOC_CAMERA_PLATFORM
-        tristate "platform camera support"
-        depends on SOC_CAMERA
-        help
-          This is a generic SoC camera platform driver, useful for testing
-
-config VIDEO_PXA27x
-        tristate "PXA27x Quick Capture Interface driver"
-        depends on VIDEO_DEV && PXA27x
-        select SOC_CAMERA
-        select VIDEOBUF_DMA_SG
-        ---help---
-          This is a v4l2 driver for the PXA27x Quick Capture Interface
-
-config VIDEO_SH_MOBILE_CEU
-        tristate "SuperH Mobile CEU Interface driver"
-        depends on VIDEO_DEV && HAS_DMA
-        select SOC_CAMERA
-        select VIDEOBUF_DMA_CONTIG
-        ---help---
-          This is a v4l2 driver for the SuperH Mobile CEU Interface
-
 endif # VIDEO_CAPTURE_DRIVERS