Hi Jeff,
On May 9 2007 21:38, Jeff Garzik wrote:
>diff --git a/drivers/net/Makefile b/drivers/net/Makefile
>index 59c0459..c5d8423 100644
>--- a/drivers/net/Makefile
>+++ b/drivers/net/Makefile
>@@ -206,6 +206,14 @@ obj-$(CONFIG_TR) += tokenring/
> obj-$(CONFIG_WAN) += wan/
> obj-$(CONFIG_ARCNET) += arcnet/
> obj-$(CONFIG_NET_PCMCIA) += pcmcia/
>+
>+obj-$(CONFIG_USB_CATC) += usb/
>+obj-$(CONFIG_USB_KAWETH) += usb/
>+obj-$(CONFIG_USB_PEGASUS) += usb/
>+obj-$(CONFIG_USB_RTL8150) += usb/
>+obj-$(CONFIG_USB_USBNET) += usb/
>+obj-$(CONFIG_USB_ZD1201) += usb/
>+
This looks, well, a bit ugly. Since we seem to be going in the direction
of using "menuconfig"s (Kconfig language object) anyway, I propose the
patch below.
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
new file mode 100644
index 0000000..3de564b
--- /dev/null
+++ b/drivers/net/usb/Kconfig
@@ -0,0 +1,338 @@
+#
+# USB Network devices configuration
+#
+comment "Networking support is needed for USB Network Adapter support"
+ depends on USB && !NET
This comment is superfluous. If !NET, then NETDEVICES is not even available.
Since you just moved/renamed it, you are not to blame. Though, I remove
it in below's patch (applies on top of
commit 5b2fc499917e5897a13add780e181b4cef197072).
Signed-off-by: Jan Engelhardt <[email protected]>
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c5d8423..5f6112d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -207,12 +207,7 @@ obj-$(CONFIG_WAN) += wan/
obj-$(CONFIG_ARCNET) += arcnet/
obj-$(CONFIG_NET_PCMCIA) += pcmcia/
-obj-$(CONFIG_USB_CATC) += usb/
-obj-$(CONFIG_USB_KAWETH) += usb/
-obj-$(CONFIG_USB_PEGASUS) += usb/
-obj-$(CONFIG_USB_RTL8150) += usb/
-obj-$(CONFIG_USB_USBNET) += usb/
-obj-$(CONFIG_USB_ZD1201) += usb/
+obj-$(CONFIG_NETDEV_USB) += usb/
obj-y += wireless/
obj-$(CONFIG_NET_TULIP) += tulip/
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 3de564b..2458f99 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -1,11 +1,12 @@
#
# USB Network devices configuration
#
-comment "Networking support is needed for USB Network Adapter support"
- depends on USB && !NET
-
-menu "USB Network Adapters"
+menuconfig NETDEVICES_USB
+ bool "USB Network Adapters"
depends on USB && NET
+ default y
+
+if NETDEVICES_USB
config USB_CATC
tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
@@ -334,5 +335,4 @@ config USB_NET_ZAURUS
really need this non-conformant variant of CDC Ethernet (or in
some cases CDC MDLM) protocol, not "g_ether".
-
-endmenu
+endif # NETDEVICES_USB
#<EOF>
Jan
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
