summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-15 08:59:08 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-15 17:16:19 -0500
commit48522bb5035561556042b74bfa8f1f8dd314e340 (patch)
tree798808941885b84ca15d1239eb93835cfbe1e987 /include
parent66c7385a5fd3f5e27adc6a356d7afbd51beca07a (diff)
downloadtalos-obmc-uboot-48522bb5035561556042b74bfa8f1f8dd314e340.tar.gz
talos-obmc-uboot-48522bb5035561556042b74bfa8f1f8dd314e340.zip
net: cosmetic: net.c checkpatch compliance
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/common.h4
-rw-r--r--include/net.h5
2 files changed, 9 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index 4b5841ef47..7338e39d13 100644
--- a/include/common.h
+++ b/include/common.h
@@ -794,6 +794,10 @@ int pcmcia_init (void);
#include <bootstage.h>
+#ifdef CONFIG_SHOW_ACTIVITY
+void show_activity(int arg);
+#endif
+
/* Multicore arch functions */
#ifdef CONFIG_MP
int cpu_status(int nr);
diff --git a/include/net.h b/include/net.h
index 2b6e59a7bf..3dbe1544ac 100644
--- a/include/net.h
+++ b/include/net.h
@@ -433,6 +433,11 @@ extern int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport,
/* Processes a received packet */
extern void NetReceive(uchar *, int);
+#ifdef CONFIG_NETCONSOLE
+void NcStart(void);
+int nc_input_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len);
+#endif
+
/*
* Check if autoload is enabled. If so, use either NFS or TFTP to download
* the boot file.
OpenPOWER on IntegriCloud