diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-08 19:22:00 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-08 19:22:00 +0100 |
| commit | d8af8582c321414087ed46512ffe5ce4f5c9c5da (patch) | |
| tree | 816afd4b4d43bfa73c8cd65867a1c264a044a41c | |
| parent | Fix __pfn_to_page(pfn) for CONFIG_DISCONTIGMEM=y (diff) | |
| parent | Staging: make usbip depend on CONFIG_NET (diff) | |
| download | linux-d8af8582c321414087ed46512ffe5ce4f5c9c5da.tar.xz linux-d8af8582c321414087ed46512ffe5ce4f5c9c5da.zip | |
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
| -rw-r--r-- | drivers/staging/Kconfig | 20 | ||||
| -rw-r--r-- | drivers/staging/usbip/Kconfig | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index e1654f59eb70..0a49cd788a75 100644 --- 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 7426235ccc44..217fb7e62c2f 100644 --- 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 |