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}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to