David E. O'Brien 507dde8b32 Remove merge conflict that I didn't notice as it was in the middle of a ... comment and thus compiled. Submitted by: bde		2003-08-25 09:28:54 +00:00
..
bt_eisa.c	Use __FBSDID().	2003-08-24 17:55:58 +00:00
bt_isa.c	Use __FBSDID().	2003-08-24 17:55:58 +00:00
bt_mca.c	Use __FBSDID().	2003-08-24 17:55:58 +00:00
bt_pci.c	Use __FBSDID().	2003-08-24 17:55:58 +00:00
bt.c	Remove merge conflict that I didn't notice as it was in the middle of a	2003-08-25 09:28:54 +00:00
btreg.h