diff options
| author | Ben Warren <bwarren@saruman.qstreams.net> | 2007-11-06 10:17:40 -0500 |
|---|---|---|
| committer | Ben Warren <bwarren@saruman.qstreams.net> | 2007-11-06 10:17:40 -0500 |
| commit | 881cf02f47390c7515f4e11727a473ab042d6d76 (patch) | |
| tree | 20ff9f08732a760022a8c09db74bbbf2538d8776 /net | |
| parent | e34a0438923a55aeb3fae8fc31ff41230969abaf (diff) | |
| parent | 992742a5b09d9040adbd156fb90756af66ade310 (diff) | |
| download | u-boot-imx-881cf02f47390c7515f4e11727a473ab042d6d76.zip u-boot-imx-881cf02f47390c7515f4e11727a473ab042d6d76.tar.gz u-boot-imx-881cf02f47390c7515f4e11727a473ab042d6d76.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 5 | ||||
| -rw-r--r-- | net/nfs.c | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/bootp.c b/net/bootp.c index cfe6f8d..55dcc81 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -979,7 +979,6 @@ void DhcpRequest(void) { BootpRequest(); } -#endif - -#endif +#endif /* CONFIG_CMD_DHCP */ +#endif /* CONFIG_CMD_NET */ @@ -405,7 +405,6 @@ rpc_lookup_reply (int prog, uchar *pkt, unsigned len) if (rpc_pkt.u.reply.rstatus || rpc_pkt.u.reply.verifier || - rpc_pkt.u.reply.astatus || rpc_pkt.u.reply.astatus) { return -1; } |