From owner-svn-src-stable@freebsd.org  Sat Apr 14 20:49:39 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E541FF98DF5;
 Sat, 14 Apr 2018 20:49:38 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 9676173097;
 Sat, 14 Apr 2018 20:49:38 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D9A02D264;
 Sat, 14 Apr 2018 20:49:38 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3EKncP2084425;
 Sat, 14 Apr 2018 20:49:38 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3EKncPY084424;
 Sat, 14 Apr 2018 20:49:38 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201804142049.w3EKncPY084424@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sat, 14 Apr 2018 20:49:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r332507 - stable/11/sys/modules
X-SVN-Group: stable-11
X-SVN-Commit-Author: gonzo
X-SVN-Commit-Paths: stable/11/sys/modules
X-SVN-Commit-Revision: 332507
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2018 20:49:39 -0000

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}