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

3 files changed, 26 insertions, 8 deletions

diff --git a/target/Config.in b/target/Config.in
index 9a5a7e518..d92d2b0ef 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -201,12 +201,15 @@ config ADK_eglibc
 config ADK_glibc
 	tristate
 
+config ADK_libc
+	tristate
+
 config ADK_LIBC
 	string
 	default "uclibc"  if ADK_uclibc
 	default "eglibc"  if ADK_eglibc
 	default "glibc"  if ADK_glibc
-	default "native"  if ADK_NATIVE
+	default "libc"  if ADK_libc
 
 menu "Target system"
 choice
@@ -231,6 +234,7 @@ default ADK_LINUX_X86
 
 config ADK_LINUX_NATIVE
 	bool "native build"
+	select ADK_libc
 	select ADK_NATIVE
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 3209dca1c..20e778314 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -47,6 +47,9 @@ config ADK_KERNEL_ATA
 config ADK_KERNEL_ATA_SFF
 	boolean
 
+config ADK_KERNEL_CONNECTOR
+	boolean
+
 config ADK_KERNEL_ATA_PIIX
 	boolean
 	select ADK_KERNEL_BLOCK
@@ -78,7 +81,7 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
 	  Enables support for AHCI Serial ATA.
 
 config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
-	prompt "kmod-loop......................... Loop mount support"
+	prompt "kmod-blk-dev-loop................. Loop mount support"
 	tristate
 	default n
 	help
@@ -118,7 +121,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
 	  device used for network connections from the machine to itself.
 
 config ADK_KPACKAGE_KMOD_BLK_DEV_NBD
-	prompt "kmod-nbd.......................... Network Block Device"
+	prompt "kmod-blk-dev-nbd.................. Network Block Device"
 	tristate
 	default n
 	help
@@ -241,7 +244,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	  Higher level volume managers such as LVM2 use this driver.
 
 config ADK_KPACKAGE_KMOD_DM_CRYPT
-	prompt "kmod-dm-crypt................... Crypt target support"
+	prompt "kmod-dm-crypt..................... Crypt target support"
 	depends on !(ADK_KERNEL_DM_CRYPT || ADK_LINUX_CRIS_FOXBOARD)
 	select ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	select ADK_KERNEL_MD
@@ -259,7 +262,7 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT
 	  <http://www.saout.de/misc/dm-crypt/>
 
 config ADK_KPACKAGE_KMOD_DM_SNAPSHOT
-	prompt "kmod-dm-snapshot................ Snapshot target"
+	prompt "kmod-dm-snapshot.................. Snapshot target"
 	select ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	depends on !ADK_LINUX_CRIS_FOXBOARD
 	tristate
@@ -267,7 +270,7 @@ config ADK_KPACKAGE_KMOD_DM_SNAPSHOT
          Allow volume managers to take writable snapshots of a device.
 
 config ADK_KPACKAGE_KMOD_DM_MIRROR
-	prompt "kmod-dm-mirror.................. Mirror target"
+	prompt "kmod-dm-mirror.................... Mirror target"
 	select ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	depends on !ADK_LINUX_CRIS_FOXBOARD
 	tristate
@@ -275,4 +278,11 @@ config ADK_KPACKAGE_KMOD_DM_MIRROR
          Allow volume managers to mirror logical volumes, also
          needed for live data migration tools such as 'pvmove'.
 
+config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD
+	prompt "kmod-blk-dev-drbd................. DRBD support (Network RAID 1)"
+	tristate
+	select ADK_KERNEL_CONNECTOR
+	help
+          DRBD - http://www.drbd.org
+
 endmenu
diff --git a/target/x86/kernel.config b/target/x86/kernel.config
index 80b42f0f6..1a6c964da 100644
--- a/target/x86/kernel.config
+++ b/target/x86/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.36
-# Wed Nov 24 20:35:48 2010
+# Fri Nov 26 00:21:27 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -348,7 +348,11 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-# CONFIG_PM is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_SUSPEND is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_ACPI is not set
 # CONFIG_SFI is not set
 
 #