diff options
| author | Tom Rini <[email protected]> | 2024-07-05 16:36:43 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-05 16:36:43 -0600 |
| commit | fd46ea0e701920eb205c2bce9d527bf0dec10b59 (patch) | |
| tree | 7fde587608497f2b1956713e8312c39d98a26b02 /net | |
| parent | 18908395edcee8450d742c670610557751866393 (diff) | |
| parent | 7d22317a18e3ace2311c741bea74efa72299e57a (diff) | |
Merge branch '2024-07-05-assorted-updates'
- Re-instate the zlib update, so we can fix it for this release,
assorted whitespace cleanups, allow mkimage to 'auto-conf' signing of
scripts, enhance ELF image support, add more HW rev support to e1000
driver, update am64x_evm config, correct mpc8xxx watchdog, update
phycore-am6 docs.
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/Kconfig b/net/Kconfig index 5dff6336293..7cb80b880a9 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -42,8 +42,8 @@ config BOOTP_SEND_HOSTNAME DNS server. To do this, they need the hostname of the DHCP requester. If CONFIG_BOOTP_SEND_HOSTNAME is defined, the content - of the "hostname" environment variable is passed as - option 12 to the DHCP server. + of the "hostname" environment variable is passed as + option 12 to the DHCP server. config NET_RANDOM_ETHADDR bool "Random ethaddr if unset" |