svn commit: r270224 - in head/sys: amd64/conf dev/si i386/conf

[John Baldwin]

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