svn commit: r332507 - stable/11/sys/modules

Oleksandr Tymoshenko gonzo at FreeBSD.org
Sat Apr 14 20:49:39 UTC 2018


Author: gonzo
Date: Sat Apr 14 20:49:38 2018
New Revision: 332507
URL: https://svnweb.freebsd.org/changeset/base/332507

Log:
  Fix mis-merge of r329507 in r331501
  
  sus/modules/Makefile part of r329507 just removed ffec
  while r331501 also added conditional clause for bcm283x_clkman
  and bcm283x_pwm. Since they're part of another revision,
  remove mi-merged chunk

Modified:
  stable/11/sys/modules/Makefile

Modified: stable/11/sys/modules/Makefile
==============================================================================
--- stable/11/sys/modules/Makefile	Sat Apr 14 19:07:56 2018	(r332506)
+++ stable/11/sys/modules/Makefile	Sat Apr 14 20:49:38 2018	(r332507)
@@ -826,11 +826,6 @@ _cloudabi64=	cloudabi64
 
 .endif
 
-.if ${MACHINE_ARCH:Marmv[67]*} != "" || ${MACHINE_CPUARCH} == "aarch64"
-_bcm283x_clkman=  bcm283x_clkman
-_bcm283x_pwm=  bcm283x_pwm
-.endif
-
 SUBDIR+=${MODULES_EXTRA}
 
 .for reject in ${WITHOUT_MODULES}


More information about the svn-src-all mailing list