The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b9945203c454d41d148fcefc191d692c33832aab
commit b9945203c454d41d148fcefc191d692c33832aab Author: Minsoo Choo <[email protected]> AuthorDate: 2026-04-20 03:08:01 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2026-07-10 14:20:32 +0000 conf: remove trailing whitespace This prevents unwanted change when saving files on IDEs (e.g. VSCode, Zed) Signed-off-by: Minsoo Choo <[email protected]> Sponsored by: The FreeBSD Foundation Pull request: https://github.com/freebsd/freebsd-src/pull/2152 (cherry picked from commit a338f5a0e7b1b5c22595aacbac44582ed5e0fe86) --- sys/conf/files | 2 +- sys/conf/files.powerpc | 10 +++++----- sys/conf/options | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 670ae0c7f469..fd28ad8e093a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1260,7 +1260,7 @@ dev/bhnd/cores/chipc/bhnd_chipc_if.m optional bhnd dev/bhnd/cores/chipc/bhnd_sprom_chipc.c optional bhnd dev/bhnd/cores/chipc/bhnd_pmu_chipc.c optional bhnd dev/bhnd/cores/chipc/chipc.c optional bhnd -dev/bhnd/cores/chipc/chipc_cfi.c optional bhnd cfi +dev/bhnd/cores/chipc/chipc_cfi.c optional bhnd cfi dev/bhnd/cores/chipc/chipc_gpio.c optional bhnd gpio dev/bhnd/cores/chipc/chipc_slicer.c optional bhnd cfi | bhnd spibus dev/bhnd/cores/chipc/chipc_spi.c optional bhnd spibus diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index b1aa54c9aa64..96665e258b91 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -231,7 +231,7 @@ dev/sound/macio/snapper.c optional snd_ai2s iicbus powermac dev/sound/macio/tumbler.c optional snd_ai2s iicbus powermac dev/syscons/scgfbrndr.c optional sc dev/tsec/if_tsec.c optional tsec -dev/tsec/if_tsec_fdt.c optional tsec +dev/tsec/if_tsec_fdt.c optional tsec dev/uart/uart_cpu_powerpc.c optional uart dev/usb/controller/ehci_fsl.c optional ehci mpc85xx dev/vt/hw/ofwfb/ofwfb.c optional vt aim @@ -328,19 +328,19 @@ powerpc/powermac/fcu.c optional powermac fcu powerpc/powermac/grackle.c optional powermac pci powerpc/powermac/hrowpic.c optional powermac pci powerpc/powermac/kiic.c optional powermac kiic -powerpc/powermac/macgpio.c optional powermac pci +powerpc/powermac/macgpio.c optional powermac pci powerpc/powermac/macio.c optional powermac pci powerpc/powermac/nvbl.c optional powermac nvbl powerpc/powermac/platform_powermac.c optional powermac powerpc/powermac/powermac_thermal.c optional powermac powerpc/powermac/pswitch.c optional powermac pswitch -powerpc/powermac/pmu.c optional powermac pmu -powerpc/powermac/smu.c optional powermac smu +powerpc/powermac/pmu.c optional powermac pmu +powerpc/powermac/smu.c optional powermac smu powerpc/powermac/smusat.c optional powermac smu powerpc/powermac/tbgpio.c optional powermac pci smp powerpc/powermac/uninorth.c optional powermac powerpc/powermac/uninorthpci.c optional powermac pci -powerpc/powermac/vcoregpio.c optional powermac +powerpc/powermac/vcoregpio.c optional powermac powerpc/powernv/opal.c optional powernv powerpc/powernv/opal_async.c optional powernv powerpc/powernv/opal_console.c optional powernv diff --git a/sys/conf/options b/sys/conf/options index c09727c8b6af..c881798a6de1 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -39,7 +39,7 @@ AHC_DEBUG_OPTS opt_aic7xxx.h AHC_REG_PRETTY_PRINT opt_aic7xxx.h AHD_DEBUG opt_aic79xx.h AHD_DEBUG_OPTS opt_aic79xx.h -AHD_TMODE_ENABLE opt_aic79xx.h +AHD_TMODE_ENABLE opt_aic79xx.h AHD_REG_PRETTY_PRINT opt_aic79xx.h # Debugging options. @@ -871,7 +871,7 @@ IWN_DEBUG opt_iwn.h # Options for the Intel 3945ABG wireless driver WPI_DEBUG opt_wpi.h -# dcons options +# dcons options DCONS_BUF_SIZE opt_dcons.h DCONS_POLL_HZ opt_dcons.h DCONS_FORCE_CONSOLE opt_dcons.h
