Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 32 insertions, 16 deletions

diff --git a/target/linux/config/Config.in.lib b/target/linux/config/Config.in.lib
index ca1092a8c..9bed11261 100644
--- a/target/linux/config/Config.in.lib
+++ b/target/linux/config/Config.in.lib
@@ -6,7 +6,7 @@ config ADK_KERNEL_CRC16
 
 config ADK_KERNEL_CRC32
 	bool
-	default n
+	default y
 
 config ADK_KPACKAGE_KMOD_CRC_ITU_T
 	prompt "kmod-crc-itu-t...................... CRC ITU-T V.41 functions"
@@ -25,13 +25,6 @@ config ADK_KPACKAGE_KMOD_CRC16
 	default n
 	help
 
-config ADK_KPACKAGE_KMOD_CRC32
-	prompt "kmod-crc32.......................... provide CRC32 library functions"
-	tristate
-        depends on ! ADK_KERNEL_CRC32
-	default n
-	help
-
 config ADK_KPACKAGE_KMOD_LIBCRC32C
 	prompt "kmod-libcrc32c...................... CRC32c Cyclic Redundancy-Check"
 	tristate
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index ef10e4832..87dc93aa0 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/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,14 +120,13 @@ 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
+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 || ADK_LINUX_MIPS64_LEMOTE
+	select ADK_KPACKAGE_KMOD_VIDEO_DEV
 	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_PWC
 	prompt "kmod-usb-pwc.................... Kernel driver for USB Philips Cameras"
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 043c698d9..5b5a6e009 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -160,7 +160,7 @@ config ADK_MOD_KERNEL_MAC80211
 	default n
 
 menu "Wireless card support"
-depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB
+depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB
 
 config ADK_KERNEL_MAC80211_DEBUG_MENU
 	boolean
@@ -227,6 +227,25 @@ config ADK_KERNEL_ATH5K_DEBUG
 	  parameter. For example:
 	   insmod ath5k.ko debug=0x00000400
 
+config ADK_KPACKAGE_KMOD_B43
+	prompt "kmod-b43..................... Broadcom B43xx wireless cards"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KPACKAGE_KMOD_FW_LOADER
+	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
+	default n
+	help
+	  Driver for Broadcom B43xx wireless chips.
+
+config ADK_KPACKAGE_KMOD_RTL8187B
+	prompt "kmod-rtl8187b................ Realtek RTL8187B wireless cards"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_MAC80211
+	depends on ADK_LINUX_MIPS64_LEMOTE
+	default y
+	help
+	  Driver for Realtek RTL8187B wireless chips.
+
 config ADK_KPACKAGE_KMOD_P54_USB
 	prompt "kmod-p54-usb................. Prism54 USB support"
 	tristate