summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGerhard Sittig <gsi@denx.de>2014-03-08 19:46:13 +0100
committerTom Rini <trini@ti.com>2014-03-12 17:04:30 -0400
commit440a5742393bb959fd7bce28f5c916355d8607ca (patch)
treeb2c108b6f92ddbce709e4c31ca23b603865430f7 /include
parent4b774ff114201175ea9c05dfa12eef3ff1704753 (diff)
downloadtalos-obmc-uboot-440a5742393bb959fd7bce28f5c916355d8607ca.tar.gz
talos-obmc-uboot-440a5742393bb959fd7bce28f5c916355d8607ca.zip
usb: net: don't ifdef routine declarations in usb_ether.h
while compilation of implemented routines and references from calling sites may be optional, declarations in header files should not be unconditionally declare the Asix and SMSC related public USB ethernet driver routines in the usb_ether.h header file Signed-off-by: Gerhard Sittig <gsi@denx.de> Acked-by: Simon Glass <sjg@chromium.org> Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/usb_ether.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/usb_ether.h b/include/usb_ether.h
index 678c9dff25..011ead7a36 100644
--- a/include/usb_ether.h
+++ b/include/usb_ether.h
@@ -40,23 +40,19 @@ struct ueth_data {
};
/*
- * Function definitions for each USB ethernet driver go here, bracketed by
- * #ifdef CONFIG_USB_ETHER_xxx...#endif
+ * Function definitions for each USB ethernet driver go here
+ * (declaration is unconditional, compilation is conditional)
*/
-#ifdef CONFIG_USB_ETHER_ASIX
void asix_eth_before_probe(void);
int asix_eth_probe(struct usb_device *dev, unsigned int ifnum,
struct ueth_data *ss);
int asix_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
struct eth_device *eth);
-#endif
-#ifdef CONFIG_USB_ETHER_SMSC95XX
void smsc95xx_eth_before_probe(void);
int smsc95xx_eth_probe(struct usb_device *dev, unsigned int ifnum,
struct ueth_data *ss);
int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
struct eth_device *eth);
-#endif
#endif /* __USB_ETHER_H__ */
OpenPOWER on IntegriCloud