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

5 files changed, 23 insertions, 5 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index dbe14cf3b..8c4d7d751 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -4,6 +4,9 @@ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND
 config ADK_KERNEL_SND_ARM
 	boolean
 
+config ADK_KERNEL_SND_USB
+	boolean
+
 config ADK_KERNEL_SND_SOC
 	boolean
 
@@ -28,6 +31,9 @@ config ADK_KERNEL_SND_MIXER_OSS
 config ADK_KERNEL_SND_PCM_OSS
 	boolean
 
+config ADK_KERNEL_SND_HRTIMER
+	boolean
+
 config ADK_KPACKAGE_KMOD_SOUND
 	tristate
 
@@ -126,6 +132,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
 	tristate
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KERNEL_SND_ARM
+	select ADK_KERNEL_SND_HRTIMER
 	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index c22ae210c..8c3ae5372 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -1,3 +1,6 @@
+config ADK_KERNEL_FILE_LOCKING
+	boolean
+
 config ADK_KERNEL_FS_POSIX_ACL
 	boolean
 	default y
@@ -62,6 +65,7 @@ config ADK_KPACKAGE_KMOD_NFS_FS
 	default n
 	select ADK_KERNEL_NFS_V3
 	select ADK_KERNEL_NFS_V4
+	select ADK_KERNEL_FILE_LOCKING
 	select ADK_KERNEL_DNOTIFY
 	select ADK_KPACKAGE_KMOD_SUNRPC
 	select ADK_KPACKAGE_KMOD_LOCKD
@@ -110,13 +114,14 @@ config ADK_KERNEL_NFSD_V4
 	default n
 
 config ADK_KPACKAGE_KMOD_NFSD
-	prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)"
+	prompt "kmod-nfsd......................... NFS server support"
 	tristate
 	default n
 	select ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_NFSD_V3
 	select ADK_KERNEL_NFSD_V4
 	select ADK_KERNEL_DNOTIFY
+	select ADK_KERNEL_FILE_LOCKING
 	select ADK_KPACKAGE_KMOD_SUNRPC
 	select ADK_KPACKAGE_KMOD_SUNRPC_GSS
 	select ADK_KPACKAGE_KMOD_LOCKD
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index d7d7ae013..9ee0511fc 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -291,8 +291,12 @@ config ADK_KPACKAGE_KMOD_R8169
 
 endmenu
 
+config ADK_KERNEL_WLAN
+	boolean
+
 config ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_WLAN
 	boolean
 
 config ADK_KERNEL_WIRELESS_EXT
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
index aa707cd91..9609cf5b2 100644
--- a/target/linux/config/Config.in.systems
+++ b/target/linux/config/Config.in.systems
@@ -60,9 +60,6 @@ config ADK_KERNEL_ARCH_AT91SAM9260
 config ADK_KERNEL_MACH_ACMENETUSFOXG20
 	boolean
 
-config ADK_KERNEL_ARCH_BCM2708
-	boolean
-
 config ADK_KERNEL_BCM47XX_SSB
 	boolean
 
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 53413abde..e1fd3c0c3 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,7 +1,11 @@
 menu "USB support"
 depends on ADK_TARGET_WITH_USB
 
+config ADK_KERNEL_USB_SUPPORT
+	boolean
+
 config ADK_KERNEL_USB
+	select ADK_KERNEL_USB_SUPPORT
 	boolean
 
 config ADK_KERNEL_USB_LIBUSUAL
@@ -29,6 +33,7 @@ config ADK_KPACKAGE_KMOD_USB
 	prompt "kmod-usb......................... USB support"
 	tristate
 	select ADK_KERNEL_NLS
+	select ADK_KERNEL_USB_SUPPORT
 	depends on !ADK_KERNEL_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
@@ -44,7 +49,6 @@ config ADK_KPACKAGE_KMOD_USB
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
 	  Universal Serial Bus (USB) is a specification for a serial bus
@@ -335,6 +339,7 @@ config ADK_KPACKAGE_KMOD_SND_USB_AUDIO
 	prompt "kmod-snd-usb-audio................ USB sound adapter"
 	tristate
 	default n
+	select ADK_KERNEL_SND_USB
 	select ADK_KPACKAGE_KMOD_SND
 	select ADK_KPACKAGE_KMOD_SND_RAWMIDI
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER