diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-05-13 12:41:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:45 -0400 |
| commit | 17b2765ef8db8dc00a24a9afd4646bb3decffbd2 (patch) | |
| tree | 1e855252c67e3fa0533c3dfb1279bbfe1de6300c /drivers/usb | |
| parent | 419a8e81686b844c9682e8f1721e6795f3264ee6 (diff) | |
USB: fix functionfs for CONFIG_NET disabled
Fix functionfs build to handle CONFIG_NET not enabled, to prevent
these build errors:
ERROR: "netif_carrier_on" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "netif_carrier_off" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "skb_realloc_headroom" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "skb_trim" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "netif_rx" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "alloc_etherdev_mq" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "ethtool_op_get_link" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "free_netdev" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "register_netdev" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "skb_push" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "skb_pull" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "dev_kfree_skb_any" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "skb_queue_tail" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "__alloc_skb" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "eth_type_trans" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "eth_validate_addr" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "skb_dequeue" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "unregister_netdev" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "__netif_schedule" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "skb_put" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "eth_mac_addr" [drivers/usb/gadget/g_ffs.ko] undefined!
ERROR: "dev_get_stats" [drivers/usb/gadget/g_ffs.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Michał Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 0282c50d6404..649c0c5f7158 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
| @@ -726,7 +726,7 @@ config USB_FUNCTIONFS | |||
| 726 | 726 | ||
| 727 | config USB_FUNCTIONFS_ETH | 727 | config USB_FUNCTIONFS_ETH |
| 728 | bool "Include CDC ECM (Ethernet) function" | 728 | bool "Include CDC ECM (Ethernet) function" |
| 729 | depends on USB_FUNCTIONFS | 729 | depends on USB_FUNCTIONFS && NET |
| 730 | help | 730 | help |
| 731 | Include an CDC ECM (Ethernet) funcion in the CDC ECM (Funcion) | 731 | Include an CDC ECM (Ethernet) funcion in the CDC ECM (Funcion) |
| 732 | Filesystem. If you also say "y" to the RNDIS query below the | 732 | Filesystem. If you also say "y" to the RNDIS query below the |
| @@ -734,7 +734,7 @@ config USB_FUNCTIONFS_ETH | |||
| 734 | 734 | ||
| 735 | config USB_FUNCTIONFS_RNDIS | 735 | config USB_FUNCTIONFS_RNDIS |
| 736 | bool "Include RNDIS (Ethernet) function" | 736 | bool "Include RNDIS (Ethernet) function" |
| 737 | depends on USB_FUNCTIONFS | 737 | depends on USB_FUNCTIONFS && NET |
| 738 | help | 738 | help |
| 739 | Include an RNDIS (Ethernet) funcion in the Funcion Filesystem. | 739 | Include an RNDIS (Ethernet) funcion in the Funcion Filesystem. |
| 740 | If you also say "y" to the CDC ECM query above the gadget will | 740 | If you also say "y" to the CDC ECM query above the gadget will |