diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:16:14 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:16:14 -0600 |
| commit | 59e7965922b683a5aca44ff294d95b206d5bc58a (patch) | |
| tree | e8453252f9987f99deeb7d7b98b7b6d99b5433cf /net | |
| parent | 3cac27c1d40b151f295dcfdb514fa928732e4ecf (diff) | |
| parent | 992742a5b09d9040adbd156fb90756af66ade310 (diff) | |
| download | u-boot-imx-59e7965922b683a5aca44ff294d95b206d5bc58a.zip u-boot-imx-59e7965922b683a5aca44ff294d95b206d5bc58a.tar.gz u-boot-imx-59e7965922b683a5aca44ff294d95b206d5bc58a.tar.bz2 | |
Merge commit 'remotes/wd/master'
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; } |