staging: fix ccg build when NET is not enabled
authorRandy Dunlap <rdunlap@xenotime.net>
Mon, 10 Sep 2012 16:03:41 +0000 (09:03 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Sep 2012 18:21:16 +0000 (11:21 -0700)
Fix build errors in ccg when CONFIG_NET is not enabled
by adding "depends on NET":

ERROR: "netif_carrier_on" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "netif_carrier_off" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "skb_realloc_headroom" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "skb_trim" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "netif_rx" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "ethtool_op_get_link" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "free_netdev" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "register_netdev" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "skb_push" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "skb_pull" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "dev_kfree_skb_any" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "skb_queue_tail" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "__alloc_skb" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "eth_type_trans" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "eth_validate_addr" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "skb_dequeue" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "unregister_netdev" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "__netif_schedule" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "skb_put" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "eth_mac_addr" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "dev_get_stats" [drivers/staging/ccg/g_ccg.ko] undefined!
ERROR: "alloc_etherdev_mqs" [drivers/staging/ccg/g_ccg.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Cc: Mike Lockwood <lockwood@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ccg/Kconfig

index 1f00d701da25ccdf1d281758fdf1f6ba35504966..8598111eb0b1a729dcd8c84a84b53499db7d1ad9 100644 (file)
@@ -2,7 +2,7 @@ if USB_GADGET
 
 config USB_G_CCG
        tristate "Configurable Composite Gadget (STAGING)"
-       depends on STAGING && BLOCK && !USB_ZERO && !USB_ZERO_HNPTEST && !USB_AUDIO && !GADGET_UAC1 && !USB_ETH && !USB_ETH_RNDIS && !USB_ETH_EEM && !USB_G_NCM && !USB_GADGETFS && !USB_FUNCTIONFS && !USB_FUNCTIONFS_ETH && !USB_FUNCTIONFS_RNDIS && !USB_FUNCTIONFS_GENERIC && !USB_FILE_STORAGE && !USB_FILE_STORAGE_TEST && !USB_MASS_STORAGE && !USB_G_SERIAL && !USB_MIDI_GADGET && !USB_G_PRINTER && !USB_CDC_COMPOSITE && !USB_G_NOKIA && !USB_G_ACM_MS && !USB_G_MULTI && !USB_G_MULTI_RNDIS && !USB_G_MULTI_CDC && !USB_G_HID && !USB_G_DBGP && !USB_G_WEBCAM
+       depends on STAGING && BLOCK && NET && !USB_ZERO && !USB_ZERO_HNPTEST && !USB_AUDIO && !GADGET_UAC1 && !USB_ETH && !USB_ETH_RNDIS && !USB_ETH_EEM && !USB_G_NCM && !USB_GADGETFS && !USB_FUNCTIONFS && !USB_FUNCTIONFS_ETH && !USB_FUNCTIONFS_RNDIS && !USB_FUNCTIONFS_GENERIC && !USB_FILE_STORAGE && !USB_FILE_STORAGE_TEST && !USB_MASS_STORAGE && !USB_G_SERIAL && !USB_MIDI_GADGET && !USB_G_PRINTER && !USB_CDC_COMPOSITE && !USB_G_NOKIA && !USB_G_ACM_MS && !USB_G_MULTI && !USB_G_MULTI_RNDIS && !USB_G_MULTI_CDC && !USB_G_HID && !USB_G_DBGP && !USB_G_WEBCAM
        help
          The Configurable Composite Gadget supports multiple USB
          functions: acm, mass storage, rndis and FunctionFS.