5 files changed, 36 insertions, 12 deletions
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 826e47570..cb6675468 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -47,7 +47,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE
 	tristate
 	select ADK_KERNEL_CRYPTO_HW
 	select ADK_KERNEL_CRYPTO
-	depends on ADK_LINUX_X86_ALIX1C
+	depends on ADK_LINUX_ALIX
 	help
 	  Say 'Y' here to use the AMD Geode LX processor on-board AES
 	  engine for the CryptoAPI AES algorithm.
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index eb2737eed..b7aad4e23 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -4,6 +4,10 @@ config ADK_LINUX_INITRAMFS_BUILTIN
 	boolean
 	default n
 
+config ADK_KERNEL_RFKILL
+	boolean
+	default n
+
 menu "Miscellaneous devices support"
 
 config ADK_KERNEL_WATCHDOG
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index ef10e4832..a67af9a89 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"
@@ -131,5 +135,4 @@ config ADK_KPACKAGE_KMOD_USB_PWC
 	default n
 	help
 
-#source package/em28xx/Config.in
 endmenu
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 09be1d34d..5b5a6e009 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -237,6 +237,15 @@ config ADK_KPACKAGE_KMOD_B43
 	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
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index b3c48c9ea..8f2f5cf1b 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -28,7 +28,7 @@ config ADK_KERNEL_USB_UHCI_HCD
 config ADK_KPACKAGE_KMOD_USB
 	prompt "kmod-usb-core..................... USB support"
 	tristate
-	default y if ADK_LINUX_X86_ALIX1C
+	default y if ADK_LINUX_ALIX
 	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
 	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 || ADK_KERNEL_USB)
@@ -81,7 +81,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	prompt   "kmod-usb-ohci................... Support for OHCI controllers"
 	tristate
-	default y if ADK_LINUX_X86_ALIX1C
+	default y if ADK_LINUX_ALIX
 	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
 	depends on !ADK_LINUX_CRIS_FOXBOARD
@@ -128,7 +128,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	prompt   "kmod-usb-ehci................... Support for USB 2.0 controllers"
 	tristate
 	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_KERNEL_USB_EHCI_HCD)
-	default y if ADK_LINUX_X86_ALIX1C
+	default y if ADK_LINUX_ALIX
 	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
 	depends on ADK_KPACKAGE_KMOD_USB
@@ -169,6 +169,14 @@ config ADK_KPACKAGE_KMOD_USB_PEGASUS
 	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 
+config ADK_KPACKAGE_KMOD_USB_HSO
+	prompt "kmod-usb-hso...................... Support for USB HSO devices"
+	tristate
+	select ADK_KERNEL_RFKILL
+	select ADK_KPACKAGE_KMOD_USB_STORAGE
+	default n
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+
 config ADK_KPACKAGE_KMOD_USB_PRINTER
 	prompt "kmod-usb-printer.................. Support for USB printers"
 	tristate