Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: make usbip depend on CONFIG_NET
  Staging: only build the tree if we really want to

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e1654f59eb709f997300d2dee136002856009f2d..0a49cd788a75e7b3385d28d2bbc170a0ff127d81 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -21,7 +21,23 @@ menuconfig STAGING
 
          If in doubt, say N here.
 
-if STAGING
+
+config STAGING_EXCLUDE_BUILD
+       bool "Exclude Staging drivers from being built"
+       default y
+       ---help---
+         Are you sure you really want to build the staging drivers?
+         They taint your kernel, don't live up to the normal Linux
+         kernel quality standards, are a bit crufty around the edges,
+         and might go off and kick your dog when you aren't paying
+         attention.
+
+         Say N here to be able to select and build the Staging drivers.
+         This option is primarily here to prevent them from being built
+         when selecting 'make allyesconfg' and 'make allmodconfig' so
+         don't be all that put off, your dog will be just fine.
+
+if !STAGING_EXCLUDE_BUILD
 
 source "drivers/staging/et131x/Kconfig"
 
@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
 
 source "drivers/staging/poch/Kconfig"
 
-endif # STAGING
+endif # !STAGING_EXCLUDE_BUILD

diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig
index 7426235ccc447b64d1851c095ec4bf160c71edf6..217fb7e62c2fd4d242c285cfbcd57df7ea3de294 100644 (file)
--- a/drivers/staging/usbip/Kconfig
+++ b/drivers/staging/usbip/Kconfig
@@ -1,6 +1,6 @@
 config USB_IP_COMMON
        tristate "USB IP support (EXPERIMENTAL)"
-       depends on USB && EXPERIMENTAL
+       depends on USB && NET && EXPERIMENTAL
        default N
        ---help---
          This enables pushing USB packets over IP to allow remote