Browse Source

fix lemote webcam support, enable v4l1 compat by default

Waldemar Brodkorb 14 years ago
parent
commit
dbe0c6f08d
3 changed files with 12 additions and 12 deletions
  1. 3 1
      mk/modules.mk
  2. 1 0
      target/Config.in
  3. 8 11
      target/linux/config/Config.in.multimedia

+ 3 - 1
mk/modules.mk

@@ -1040,7 +1040,9 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\
 	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
 ,55))
 
-$(eval $(call KMOD_template,VIDEODEV,videodev,\
+$(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
+	$(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \
+	$(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \
 	$(MODULES_DIR)/kernel/drivers/media/video/videodev \
 ,65))
 

+ 1 - 0
target/Config.in

@@ -291,6 +291,7 @@ config ADK_LINUX_MIPS64_LEMOTE
 	select ADK_TARGET_WITH_RTC
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	select ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
 	help
 	  Lemote Subnotebook.

+ 8 - 11
target/linux/config/Config.in.multimedia

@@ -1,6 +1,10 @@
 menu "Multimedia devices support"
 depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB
 
+config ADK_KERNEL_MEDIA_SUPPORT
+	boolean
+	default n
+
 config ADK_KERNEL_SND_AC97_CODEC
 	boolean
 	default n
@@ -97,8 +101,9 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
 	 ALSA AMD CS5535 driver
 
 config ADK_KPACKAGE_KMOD_VIDEO_DEV
-	prompt "kmod-videodev................... Video (For Linux) kernel support"
+	prompt "kmod-video-dev.................. Video (For Linux) kernel support"
 	tristate
+	select ADK_KERNEL_MEDIA_SUPPORT
 	default n
 	help
 	  Support for audio/video capture and overlay devices and FM radio
@@ -115,19 +120,11 @@ config ADK_KPACKAGE_KMOD_VIDEO_DEV
 	  Documentation for V4L2 is also available on the web at
 	  <http://bytesex.org/v4l/>.
 
-config ADK_KPACKAGE_KMOD_VIDEO_V4L1
-	prompt "................................ Enable Video For Linux API 1 (DEPRECATED)"
-	boolean
-	default n
-	depends on ADK_KPACKAGE_KMOD_VIDEO_DEV
-	help
-	  Enables a compatibility API used by most V4L2 devices to allow
-	  its usage with legacy applications that supports only V4L1 api.
-
 config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS
 	prompt "kmod-usb-video-class............ Kernel driver for USB video webcams"
 	tristate
-	depends on ADK_KPACKAGE_KMOD_USB
+	depends on ADK_KPACKAGE_KMOD_USB || ADK_LINUX_MIPS64_LEMOTE
+	select ADK_KPACKAGE_KMOD_VIDEO_DEV
 	default n
 	help