Index: arch/i386/conf/ALL
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/ALL,v
retrieving revision 1.331
diff -u -u -r1.331 ALL
--- arch/i386/conf/ALL	29 Jan 2012 18:55:12 -0000	1.331
+++ arch/i386/conf/ALL	3 Feb 2012 23:30:03 -0000
@@ -388,6 +388,7 @@
 pckbc*		at acpi?		# PC keyboard controller
 pcppi*		at acpi?		# AT-style speaker sound
 thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
+#tpm*		at acpi?		# ACPI TPM (Experimental)
 ug*		at acpi?		# Abit uGuru Hardware monitor
 wb*		at acpi?		# Winbond W83L518D SD/MMC reader
 sdmmc*		at wb?			# SD/MMC bus
@@ -1564,6 +1565,13 @@
 ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x
 
 
+# Trusted Platform Module
+tpm*   at isa? iomem 0xfed40000 irq 7
+#tpm*  at isa? port 0x02e
+#tpm*  at isa? port 0x04e 
+#tpm*  at isa? port 0x07e 
+#tpm*  at isa? port 0x0ee
+
 # Joysticks
 
 joy*	at pnpbios? index ?		# Game port
Index: compat/ndis/subr_ndis.c
===================================================================
RCS file: /cvsroot/src/sys/compat/ndis/subr_ndis.c,v
retrieving revision 1.25
diff -u -u -r1.25 subr_ndis.c
--- compat/ndis/subr_ndis.c	17 Jul 2011 20:54:50 -0000	1.25
+++ compat/ndis/subr_ndis.c	3 Feb 2012 23:30:18 -0000
@@ -617,19 +617,16 @@
 }
 
 static ndis_status
+ndis_encode_parm(
+    ndis_miniport_block	*block,
 #ifdef __FreeBSD__
-ndis_encode_parm(block, oid, type, parm)
-	ndis_miniport_block	*block;	
-    struct sysctl_oid	*oid;
-	ndis_parm_type		type;
-	ndis_config_parm	**parm;
-#else /* __NetBSD__ */
-ndis_encode_parm(block, data, type, parm)
-	ndis_miniport_block	*block;	
-    void				*data;
-	ndis_parm_type		type;
-	ndis_config_parm	**parm;
-#endif	
+    struct sysctl_oid	*oid,
+#define oiddata	oid->iod_arg1
+#else
+    void 		*oiddata,
+#endif
+    ndis_parm_type	type,
+    ndis_config_parm	**parm)
 {
 	uint16_t		*unicode;
 	ndis_unicode_string	*ustr;
@@ -641,56 +638,31 @@
 
 	switch(type) {
 	case ndis_parm_string:
-#ifdef __FreeBSD__		
-		ndis_ascii_to_unicode((char *)oid->oid_arg1, &unicode);
-#else /* __NetBSD__ */
-		ndis_ascii_to_unicode((char *)data, &unicode);
-#endif		
+		ndis_ascii_to_unicode((char *)oiddata, &unicode);
 		(*parm)->ncp_type = ndis_parm_string;
 		ustr = &(*parm)->ncp_parmdata.ncp_stringdata;
-#ifdef __FreeBSD__		
-		ustr->us_len = strlen((char *)oid->oid_arg1) * 2;
-#else /* __NetBSD__ */
-		ustr->us_len = strlen((char *)data) * 2;
-#endif		
+		ustr->us_len = strlen((char *)oiddata) * 2;
 		ustr->us_buf = unicode;
 		break;
 	case ndis_parm_int:
-#ifdef __FreeBSD__		
-		if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0) {
-#else /* __NetBSD__ */
-		if (strncmp((char *)data, "0x", 2) == 0) {
-#endif		
+		if (strncmp(oiddata, "0x", 2) == 0) {
 			base = 16;
 		}
 		else
 			base = 10;
 		(*parm)->ncp_type = ndis_parm_int;
 		(*parm)->ncp_parmdata.ncp_intdata =
-#ifdef __FreeBSD__				
-		    strtol((char *)oid->oid_arg1, NULL, base);
-#else /* __NetBSD__ */
-/* TODO: NetBSD dosen't seem to have a strtol in sys/lib/libkern I hope strtoul is OK */
-		    strtoul((char *)data, NULL, base);
-#endif		
+		    strtoul((char *)oiddata, NULL, base);
 		break;
 	case ndis_parm_hexint:
-#ifdef __FreeBSD__		
-		if (strncmp((char *)oid->oid_arg1, "0x", 2) == 0) {
-#else /* __NetBSD__ */
-		if (strncmp((char *)data, "0x", 2) == 0) {
-#endif
+		if (strncmp((char *)oiddata, "0x", 2) == 0) {
 			base = 16;
 		}
 		else
 			base = 10;
 		(*parm)->ncp_type = ndis_parm_hexint;
 		(*parm)->ncp_parmdata.ncp_intdata =
-#ifdef __FreeBSD__				
-		    strtoul((char *)oid->oid_arg1, NULL, base);
-#else /* __NetBSD__ */
-		    strtoul((char *)data, NULL, base);
-#endif		
+		    strtoul((char *)oiddata, NULL, base);
 		break;
 	default:
 		return(NDIS_STATUS_FAILURE);
Index: compat/ndis/subr_ntoskrnl.c
===================================================================
RCS file: /cvsroot/src/sys/compat/ndis/subr_ntoskrnl.c,v
retrieving revision 1.21
diff -u -u -r1.21 subr_ntoskrnl.c
--- compat/ndis/subr_ntoskrnl.c	31 Aug 2011 18:31:02 -0000	1.21
+++ compat/ndis/subr_ntoskrnl.c	3 Feb 2012 23:30:19 -0000
@@ -661,17 +661,17 @@
 }
 
 __stdcall static irp *
-IoBuildDeviceIoControlRequest(iocode, dobj, ibuf, ilen, obuf, olen,
-    isinternal, event, status)
-	uint32_t		iocode;
-	device_object		*dobj;
-	void			*ibuf;
-	uint32_t		ilen;
-	void			*obuf;
-	uint32_t		olen;
-	uint8_t			isinternal;
-	nt_kevent		*event;
-	io_status_block		*status;
+IoBuildDeviceIoControlRequest(
+	uint32_t		iocode,
+	device_object		*dobj,
+	void			*ibuf,
+	uint32_t		ilen,
+	void			*obuf,
+	uint32_t		olen,
+	uint8_t			isinternal,
+	nt_kevent		*event,
+	io_status_block		*status
+)
 {
 	irp			*ip;
 	io_stack_location	*sl;
Index: compat/ndis/subr_pe.c
===================================================================
RCS file: /cvsroot/src/sys/compat/ndis/subr_pe.c,v
retrieving revision 1.6
diff -u -u -r1.6 subr_pe.c
--- compat/ndis/subr_pe.c	18 Mar 2009 17:06:48 -0000	1.6
+++ compat/ndis/subr_pe.c	3 Feb 2012 23:30:19 -0000
@@ -426,10 +426,11 @@
  */
 
 int
-pe_get_import_descriptor(imgbase, desc, module)
-	vm_offset_t		imgbase;
-	image_import_descriptor	*desc;
-	const char		*module;
+pe_get_import_descriptor(
+	vm_offset_t		imgbase,
+	image_import_descriptor	*desc,
+	const char		*module
+)
 {	
 	vm_offset_t		offset;
 	image_import_descriptor	*imp_desc;
Index: conf/Makefile.kern.inc
===================================================================
RCS file: /cvsroot/src/sys/conf/Makefile.kern.inc,v
retrieving revision 1.150
diff -u -u -r1.150 Makefile.kern.inc
--- conf/Makefile.kern.inc	19 Dec 2011 14:06:17 -0000	1.150
+++ conf/Makefile.kern.inc	3 Feb 2012 23:30:20 -0000
@@ -74,6 +74,9 @@
 	${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "prep"
 CWARNFLAGS+=	-Wextra -Wno-unused-parameter
 .  endif
+.  if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CWARNFLAGS+=	-Wold-style-definition
+.  endif
 . endif
 # Add -Wno-sign-compare.  -Wsign-compare is included in -Wall as of GCC 3.3,
 # but our sources aren't up for it yet.
Index: dev/pci/isic_pci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/isic_pci.c,v
retrieving revision 1.37
diff -u -u -r1.37 isic_pci.c
--- dev/pci/isic_pci.c	6 Dec 2009 23:14:05 -0000	1.37
+++ dev/pci/isic_pci.c	3 Feb 2012 23:30:22 -0000
@@ -96,8 +96,8 @@
 	{ 0, 0, 0, NULL, NULL, NULL },
 };
 
-static const struct isic_pci_product * find_matching_card(pa)
-	struct pci_attach_args *pa;
+static const struct isic_pci_product * find_matching_card(
+    struct pci_attach_args *pa)
 {
 	const struct isic_pci_product * pp = NULL;
 
Index: dev/scsipi/if_se.c
===================================================================
RCS file: /cvsroot/src/sys/dev/scsipi/if_se.c,v
retrieving revision 1.83
diff -u -u -r1.83 if_se.c
--- dev/scsipi/if_se.c	2 Apr 2011 08:11:32 -0000	1.83
+++ dev/scsipi/if_se.c	3 Feb 2012 23:30:23 -0000
@@ -351,17 +351,9 @@
 
 
 static inline int
-se_scsipi_cmd(periph, cmd, cmdlen, data_addr, datalen,
-		       retries, timeout, bp, flags)
-	struct scsipi_periph *periph;
-	struct scsipi_generic *cmd;
-	int cmdlen;
-	u_char *data_addr;
-	int datalen;
-	int retries;
-	int timeout;
-	struct buf *bp;
-	int flags;
+se_scsipi_cmd(struct scsipi_periph *periph, struct scsipi_generic *cmd,
+    int cmdlen, u_char *data_addr, int datalen, int retries, int timeout,
+    struct buf *bp, int flags)
 {
 	int error;
 	int s = splbio();