diff --git a/sys/dev/pci/bktr/bktr_audio.h b/sys/dev/pci/bktr/bktr_audio.h
index d7631bc033a4..ca8023190511 100644
--- a/sys/dev/pci/bktr/bktr_audio.h
+++ b/sys/dev/pci/bktr/bktr_audio.h
@@ -1,6 +1,7 @@
-/*	$NetBSD: bktr_audio.h,v 1.1.1.1 2000/05/07 00:16:18 wiz Exp $	*/
+/* $SourceForge: bktr_audio.h,v 1.4 2003/03/11 23:11:21 thomasklausner Exp $ */
 
-/* FreeBSD: src/sys/dev/bktr/bktr_audio.h,v 1.2 1999/10/28 13:58:14 roger Exp */
+/*	$NetBSD: bktr_audio.h,v 1.1.1.2 2003/03/12 00:02:19 wiz Exp $	*/
+/* $FreeBSD: src/sys/dev/bktr/bktr_audio.h,v 1.2 1999/10/28 13:58:14 roger Exp$ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -52,35 +53,35 @@
 /*
  * Select Audio source, and allow muting
  */
-int	set_audio( bktr_ptr_t bktr, int mode );
-void	temp_mute( bktr_ptr_t bktr, int flag );
+int	set_audio(bktr_ptr_t bktr, int mode);
+void	temp_mute(bktr_ptr_t bktr, int flag);
 
 
 /*
  * Initialise any MSP or TDA devices
  */
-void	init_audio_devices( bktr_ptr_t bktr );
+void	init_audio_devices(bktr_ptr_t bktr);
 
 
 /*
  * MSP34xx Audio Chip functions.
  */
-void	msp_autodetect( bktr_ptr_t bktr );
-void	msp_read_id( bktr_ptr_t bktr );
+void	msp_autodetect(bktr_ptr_t bktr);
+void	msp_read_id(bktr_ptr_t bktr);
 
 
 /*
  * DPL35xx Audio Chip functions.
  */
-void	dpl_autodetect( bktr_ptr_t bktr );
-void	dpl_read_id( bktr_ptr_t bktr );
+void	dpl_autodetect(bktr_ptr_t bktr);
+void	dpl_read_id(bktr_ptr_t bktr);
 
 
 /*
  * TDA98xx Audio Chip functions.
  */
-void	init_BTSC( bktr_ptr_t bktr ); 
-int	set_BTSC( bktr_ptr_t bktr, int control );
+void	init_BTSC(bktr_ptr_t bktr);
+int	set_BTSC(bktr_ptr_t bktr, int control);
 
 
 
diff --git a/sys/dev/pci/bktr/bktr_mem.h b/sys/dev/pci/bktr/bktr_mem.h
index a645309fc393..0dea9751d516 100644
--- a/sys/dev/pci/bktr/bktr_mem.h
+++ b/sys/dev/pci/bktr/bktr_mem.h
@@ -1,6 +1,7 @@
-/*	$NetBSD: bktr_mem.h,v 1.1.1.1 2000/10/28 14:17:41 wiz Exp $	*/
+/* $SourceForge: bktr_mem.h,v 1.2 2003/03/11 23:11:25 thomasklausner Exp $ */
 
-/* FreeBSD: src/sys/dev/bktr/bktr_mem.h,v 1.1 2000/09/10 14:34:08 roger Exp */
+/*	$NetBSD: bktr_mem.h,v 1.1.1.2 2003/03/12 00:02:32 wiz Exp $	*/
+/* $FreeBSD: src/sys/dev/bktr/bktr_mem.h,v 1.1 2000/09/10 14:34:08 roger Exp$ */
 
 /*
  * This is prt of the Driver for Video Capture Cards (Frame grabbers)
diff --git a/sys/dev/pci/bktr/bktr_tuner.h b/sys/dev/pci/bktr/bktr_tuner.h
index 5d28f4074788..d1de0e8aa675 100644
--- a/sys/dev/pci/bktr/bktr_tuner.h
+++ b/sys/dev/pci/bktr/bktr_tuner.h
@@ -1,13 +1,14 @@
-/*	$NetBSD: bktr_tuner.h,v 1.1.1.1 2000/05/07 00:16:18 wiz Exp $	*/
+/* $SourceForge: bktr_tuner.h,v 1.3 2003/03/11 23:11:28 thomasklausner Exp $ */
 
-/* FreeBSD: src/sys/dev/bktr/bktr_tuner.h,v 1.1 1999/09/26 22:06:20 roger Exp */
+/*	$NetBSD: bktr_tuner.h,v 1.1.1.2 2003/03/12 00:02:40 wiz Exp $	*/
+/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.h,v 1.1 1999/09/26 22:06:20 roger Exp$ */
 
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
  * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879
  * chipset.
  * Copyright Roger Hardiman and Amancio Hasty.
- * 
+ *
  * bktr_tuner : This deals with controlling the tuner fitted to TV cards.
  *
  */
@@ -63,21 +64,21 @@
 #define ALPS_TSBH1              13
 #define Bt848_MAX_TUNER         14
 
-/* experimental code for Automatic Frequency Control */ 
+/* experimental code for Automatic Frequency Control */
 #define TUNER_AFC
 
 /*
  * Fill in the tuner entries in the bktr_softc based on the selected tuner
  * type (from the list of tuners above)
  */
-void	select_tuner( bktr_ptr_t bktr, int tuner_type );
+void	select_tuner(bktr_ptr_t bktr, int tuner_type);
 
 
 /*
  * The Channel Set maps TV channels eg Ch 36, Ch 51, onto frequencies
  * and is country specific.
  */
-int	tuner_getchnlset( struct bktr_chnlset *chnlset );
+int	tuner_getchnlset(struct bktr_chnlset *chnlset);
 
 /*
  * tv_channel sets the tuner to channel 'n' using the current Channel Set
@@ -86,19 +87,19 @@ int	tuner_getchnlset( struct bktr_chnlset *chnlset );
  */
 #define TV_FREQUENCY       0
 #define FM_RADIO_FREQUENCY 1
-int	tv_channel( bktr_ptr_t bktr, int channel );
-int	tv_freq( bktr_ptr_t bktr, int frequency, int type );
-int	get_tuner_status( bktr_ptr_t bktr );
+int	tv_channel(bktr_ptr_t bktr, int channel);
+int	tv_freq(bktr_ptr_t bktr, int frequency, int type);
+int	get_tuner_status(bktr_ptr_t bktr);
 
-#if defined( TUNER_AFC )
-int	do_afc( bktr_ptr_t bktr, int addr, int frequency );
+#if defined(TUNER_AFC)
+int	do_afc(bktr_ptr_t bktr, int addr, int frequency);
 #endif /* TUNER_AFC */
 
 
-/* 
+/*
  * This is for start-up convenience only, NOT mandatory.
  */
-#if !defined( DEFAULT_CHNLSET )
+#if !defined(DEFAULT_CHNLSET)
 #define DEFAULT_CHNLSET CHNLSET_WEUROPE
 #endif