diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:08:15 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-11-07 14:08:15 -0600 |
| commit | 607b3ae27efdb709719f0713113fcf4b073676c1 (patch) | |
| tree | e8453252f9987f99deeb7d7b98b7b6d99b5433cf /net/bootp.c | |
| parent | 3cac27c1d40b151f295dcfdb514fa928732e4ecf (diff) | |
| parent | 992742a5b09d9040adbd156fb90756af66ade310 (diff) | |
| download | u-boot-imx-607b3ae27efdb709719f0713113fcf4b073676c1.zip u-boot-imx-607b3ae27efdb709719f0713113fcf4b073676c1.tar.gz u-boot-imx-607b3ae27efdb709719f0713113fcf4b073676c1.tar.bz2 | |
Merge commit 'remotes/wd/master' into newmaster
Diffstat (limited to 'net/bootp.c')
| -rw-r--r-- | net/bootp.c | 5 |
1 files changed, 2 insertions, 3 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 */ |