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

Conflicts:
	package/binutils/Makefile

6 files changed, 8 insertions, 12 deletions

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 263b17a45..d840e9014 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -6,7 +6,6 @@ source target/linux/config/Config.in.input
 source target/linux/config/Config.in.pcmcia
 source target/linux/config/Config.in.network
 source target/linux/config/Config.in.netfilter
-source target/linux/config/Config.in.ipvs
 source target/linux/config/Config.in.multimedia
 source target/linux/config/Config.in.crypto
 source target/linux/config/Config.in.bluetooth
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index 76d35c39f..8d232448f 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -94,7 +94,7 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
 	prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver"
 	depends on ADK_KPACKAGE_KMOD_SND
 	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
-	depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS64_LEMOTE
+	depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS64_LEMOTE || ADK_NATIVE
 	tristate
 	default n
 	help
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 368b66d49..7f1b1d584 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -237,14 +237,13 @@ config ADK_KPACKAGE_KMOD_B43
 	help
 	  Driver for Broadcom B43xx wireless chips.
 
-config ADK_KPACKAGE_KMOD_RTL8187B
-	prompt "kmod-rtl8187b................ Realtek RTL8187B wireless cards"
+config ADK_KPACKAGE_KMOD_RTL8187
+	prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_MAC80211
-	depends on ADK_LINUX_MIPS64_LEMOTE
-	default y
+	default n
 	help
-	  Driver for Realtek RTL8187B wireless chips.
+	  Driver for Realtek RTL8187/RTL8187B wireless chips.
 
 config ADK_KPACKAGE_KMOD_P54_USB
 	prompt "kmod-p54-usb................. Prism54 USB support"
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 812a7073c..71176417f 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -265,6 +265,7 @@ config ADK_KPACKAGE_KMOD_BONDING
 
 source target/linux/config/Config.in.sched
 source target/linux/config/Config.in.ipsec
+source target/linux/config/Config.in.ipvs
 
 endmenu
 
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 8f2f5cf1b..dc25cb4b8 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -26,10 +26,9 @@ config ADK_KERNEL_USB_UHCI_HCD
 	default n
 
 config ADK_KPACKAGE_KMOD_USB
-	prompt "kmod-usb-core..................... USB support"
+	prompt "kmod-usb......................... USB support"
 	tristate
 	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)
 	select ADK_KERNEL_NLS
@@ -82,7 +81,6 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	prompt   "kmod-usb-ohci................... Support for OHCI controllers"
 	tristate
 	default y if ADK_LINUX_ALIX
-	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
 	depends on !ADK_LINUX_CRIS_FOXBOARD
 	depends on ADK_KPACKAGE_KMOD_USB
@@ -129,7 +127,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	tristate
 	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_KERNEL_USB_EHCI_HCD)
 	default y if ADK_LINUX_ALIX
-	default y if ADK_LINUX_MIPS64_LEMOTE
 	default n
 	depends on ADK_KPACKAGE_KMOD_USB
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
diff --git a/target/linux/kernel.control b/target/linux/kernel.control
index c456fa8f4..df2c18ad9 100644
--- a/target/linux/kernel.control
+++ b/target/linux/kernel.control
@@ -1,5 +1,5 @@
 Package: kernel
 Priority: optional
 Section: sys
-Description: Virtual package for the Kernel
+Description: package for the Linux Kernel