From owner-svn-src-head@FreeBSD.ORG Wed Aug 20 16:07:18 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6944426; Wed, 20 Aug 2014 16:07:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8ACB3205; Wed, 20 Aug 2014 16:07:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7KG7IVS080251; Wed, 20 Aug 2014 16:07:18 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7KG7IEq080248; Wed, 20 Aug 2014 16:07:18 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201408201607.s7KG7IEq080248@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 20 Aug 2014 16:07:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270224 - in head/sys: amd64/conf dev/si i386/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Aug 2014 16:07:18 -0000 Author: jhb Date: Wed Aug 20 16:07:17 2014 New Revision: 270224 URL: http://svnweb.freebsd.org/changeset/base/270224 Log: Fix build of si(4) and enable it in LINT on amd64 and i386. Modified: head/sys/amd64/conf/NOTES head/sys/dev/si/si.c head/sys/i386/conf/NOTES Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Wed Aug 20 16:06:24 2014 (r270223) +++ head/sys/amd64/conf/NOTES Wed Aug 20 16:07:17 2014 (r270224) @@ -521,7 +521,7 @@ hint.pbio.0.port="0x360" device smbios device vpd device asmc -#device si +device si device tpm device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG Modified: head/sys/dev/si/si.c ============================================================================== --- head/sys/dev/si/si.c Wed Aug 20 16:06:24 2014 (r270223) +++ head/sys/dev/si/si.c Wed Aug 20 16:07:17 2014 (r270224) @@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$"); #ifndef lint -static const char si_copyright1[] = "@(#) Copyright (C) Specialix International, 1990,1992,1998", - si_copyright2[] = "@(#) Copyright (C) Andy Rutter 1993", - si_copyright3[] = "@(#) Copyright (C) Peter Wemm 2000"; +__IDSTRING(si_copyright1, "@(#) Copyright (C) Specialix International, 1990,1992,1998"); +__IDSTRING(si_copyright2, "@(#) Copyright (C) Andy Rutter 1993"); +__IDSTRING(si_copyright3, "@(#) Copyright (C) Peter Wemm 2000"); #endif /* not lint */ #include "opt_compat.h" Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Wed Aug 20 16:06:24 2014 (r270223) +++ head/sys/i386/conf/NOTES Wed Aug 20 16:07:17 2014 (r270224) @@ -871,7 +871,7 @@ device spic hint.spic.0.at="isa" hint.spic.0.port="0x10a0" device asmc -#device si +device si device tpm device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG