Commit d8af8582 authored by Linus Torvalds's avatar Linus Torvalds

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
parents c5d71243 b8f6ec2e
...@@ -21,7 +21,23 @@ menuconfig STAGING ...@@ -21,7 +21,23 @@ menuconfig STAGING
If in doubt, say N here. 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" source "drivers/staging/et131x/Kconfig"
...@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig" ...@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
source "drivers/staging/poch/Kconfig" source "drivers/staging/poch/Kconfig"
endif # STAGING endif # !STAGING_EXCLUDE_BUILD
config USB_IP_COMMON config USB_IP_COMMON
tristate "USB IP support (EXPERIMENTAL)" tristate "USB IP support (EXPERIMENTAL)"
depends on USB && EXPERIMENTAL depends on USB && NET && EXPERIMENTAL
default N default N
---help--- ---help---
This enables pushing USB packets over IP to allow remote This enables pushing USB packets over IP to allow remote
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment