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
..
aac	Use __FBSDID().	2003-08-24 17:55:58 +00:00
acpica	Use __FBSDID().	2003-08-24 17:55:58 +00:00
adlink	Use __FBSDID().	2003-08-24 17:55:58 +00:00
advansys	Use __FBSDID().	2003-08-24 17:55:58 +00:00
agp	PCI header files live in dev/pci.	2003-08-23 19:32:18 +00:00
aha	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ahb	Make this at least compile on 64 bit platforms. Its been breaking	2003-07-30 20:09:22 +00:00
aic	Use __FBSDID().	2003-08-24 17:55:58 +00:00
aic7xxx	Use __FBSDID().	2003-08-24 17:55:58 +00:00
amd	Prefer new location of pci include files (which have only been in the	2003-08-22 05:54:52 +00:00
amr	Use __FBSDID().	2003-08-24 17:55:58 +00:00
an	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ar	Use __FBSDID().	2003-08-24 17:55:58 +00:00
asr	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ata	Unify prototypes.	2003-08-25 09:01:49 +00:00
ath	MFp4 changes to fix locking issues and correct reference	2003-08-19 22:17:04 +00:00
atkbdc	Use __FBSDID().	2003-08-24 17:55:58 +00:00
awi	Use __FBSDID().	2003-08-24 17:55:58 +00:00
bge	Use __FBSDID().	2003-08-24 17:55:58 +00:00
bktr	Use __FBSDID().	2003-08-24 17:55:58 +00:00
buslogic	Remove merge conflict that I didn't notice as it was in the middle of a	2003-08-25 09:28:54 +00:00
cardbus	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ciss	Prefer new location of pci include files (which have only been in the	2003-08-22 05:54:52 +00:00
cm	Use __FBSDID().	2003-08-24 17:55:58 +00:00
cnw	Use __FBSDID().	2003-08-24 17:55:58 +00:00
cs	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ct	Use __FBSDID().	2003-08-24 17:55:58 +00:00
cy	Use __FBSDID().	2003-06-11 06:34:30 +00:00
dc	Make TX on davicom 9102A working again. This chip needs	2003-08-24 23:47:44 +00:00
de	Prefer new location of pci include files (which have only been in the	2003-08-22 07:20:27 +00:00
dec	Use __FBSDID().	2003-08-24 17:55:58 +00:00
dgb	Remove a few ushorts I missed in my earlier pass.	2003-08-15 14:55:50 +00:00
digi	Use __FBSDID().	2003-08-24 17:55:58 +00:00
dpt	Use __FBSDID().	2003-08-24 17:55:58 +00:00
drm	Comment out a couple of __inline__s until we can get inlines to be actually	2003-08-24 22:04:12 +00:00
ed	Use __FBSDID().	2003-08-24 17:55:58 +00:00
eisa	Use __FBSDID().	2003-08-24 17:55:58 +00:00
em	Use __FBSDID().	2003-08-24 17:55:58 +00:00
en	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ep	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ex	Use __FBSDID().	2003-08-24 17:55:58 +00:00
exca	Use __FBSDID().	2003-08-24 17:55:58 +00:00
fatm	Remove duplicate SCM ID.	2003-08-24 20:18:11 +00:00
fb	Use __FBSDID().	2003-08-24 17:55:58 +00:00
fdc	- Use the new resource_disabled() helper function to see if devices are	2003-07-02 16:09:02 +00:00
fe	Use __FBSDID().	2003-08-24 17:55:58 +00:00
firewire	Use __FBSDID().	2003-08-24 17:55:58 +00:00
fxp	Use __FBSDID().	2003-08-24 17:55:58 +00:00
gem	Use __FBSDID().	2003-08-24 17:55:58 +00:00
gfb	Use __FBSDID().	2003-08-24 17:55:58 +00:00
gx	Use __FBSDID().	2003-08-24 17:55:58 +00:00
harp	Use __FBSDID().	2003-08-24 17:55:58 +00:00
hatm	Use __FBSDID().	2003-08-24 17:55:58 +00:00
hea	Use __FBSDID().	2003-08-24 17:55:58 +00:00
hfa	Use __FBSDID().	2003-08-24 17:55:58 +00:00
hifn	Use __FBSDID().	2003-08-24 17:55:58 +00:00
hme	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ic	- Clean up function calling conventions.	2003-03-28 06:27:08 +00:00
ichsmb	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ida	Use __FBSDID().	2003-08-24 17:55:58 +00:00
idt	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ie	Use __FBSDID().	2003-08-24 17:55:58 +00:00
iicbus	Use __FBSDID().	2003-08-24 17:55:58 +00:00
iir	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ips	Use __FBSDID().	2003-08-24 17:55:58 +00:00
isp	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ispfw	Use __FBSDID().	2003-08-24 17:55:58 +00:00
joy	Use __FBSDID().	2003-08-24 17:55:58 +00:00
kbd	Use __FBSDID().	2003-08-24 17:55:58 +00:00
lge	Use __FBSDID().	2003-08-24 17:55:58 +00:00
lmc	Use __FBSDID().	2003-08-24 17:55:58 +00:00
lnc	Use __FBSDID().	2003-08-24 17:55:58 +00:00
matcd	Use __FBSDID().	2003-08-24 17:55:58 +00:00
mc146818
mca	Use __FBSDID().	2003-08-24 17:55:58 +00:00
mcd	Use __FBSDID().	2003-08-24 17:55:58 +00:00
md	Consistently use the BSD u_int and u_short instead of the SYSV uint and	2003-08-07 15:04:27 +00:00
mii	Use __FBSDID().	2003-08-24 17:55:58 +00:00
mk48txx	Use __FBSDID().	2003-08-24 17:55:58 +00:00
mlx	Use __FBSDID().	2003-08-24 17:55:58 +00:00
mly	Prefer new location of pci include files (which have only been in the	2003-08-22 06:42:59 +00:00
mpt	Use __FBSDID().	2003-08-24 17:55:58 +00:00
mse	Use __FBSDID().	2003-06-02 16:32:55 +00:00
musycc	Use __FBSDID().	2003-08-24 17:55:58 +00:00
my	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ncv	Use __FBSDID().	2003-08-24 17:55:58 +00:00
nge	Use __FBSDID().	2003-08-24 17:55:58 +00:00
nmdm	Use __FBSDID().	2003-08-24 17:55:58 +00:00
nsp	Use __FBSDID().	2003-08-24 17:55:58 +00:00
null	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ofw	Use __FBSDID().	2003-08-24 17:55:58 +00:00
owi	Check in the known good version of the wi driver, with prism/symbol	2003-08-24 05:42:49 +00:00
patm	Use __FBSDID().	2003-08-24 17:55:58 +00:00
pccard	Use __FBSDID().	2003-08-24 17:55:58 +00:00
pccbb	Add newly discovered ENE Technologies CardBus bridges to the list:	2003-08-22 08:49:56 +00:00
pcf	fix another LP64 problem. READ_IVAR takes a pointer to an uintptr_t, not	2003-06-20 07:22:54 +00:00
pci	Use __FBSDID().	2003-08-24 17:55:58 +00:00
pcic	Use __FBSDID().	2003-08-24 17:55:58 +00:00
pdq	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ppbus	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ppc	Forgot an added file in the last commit.	2003-08-01 05:02:55 +00:00
pst	Use __FBSDID().	2003-08-24 17:55:58 +00:00
puc	Use __FBSDID().	2003-08-24 17:55:58 +00:00
raidframe	Use __FBSDID().	2003-08-24 17:55:58 +00:00
random	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ray	Use __FBSDID().	2003-08-24 17:55:58 +00:00
rc	Consistently use the BSD u_int and u_short instead of the SYSV uint and	2003-08-07 15:04:27 +00:00
rndtest	Use __FBSDID().	2003-08-24 17:55:58 +00:00
rp	Use __FBSDID().	2003-08-24 17:55:58 +00:00
sab	Use __FBSDID().	2003-08-24 18:03:45 +00:00
safe	Prefer new location of pci include files (which have only been in the	2003-08-22 07:08:17 +00:00
sbni	Use __FBSDID().	2003-08-24 18:03:45 +00:00
sbsh	Use __FBSDID().	2003-08-24 18:03:45 +00:00
scd	Use __FBSDID().	2003-08-24 18:03:45 +00:00
sf	Prefer new location of pci include files (which have only been in the	2003-08-22 07:20:27 +00:00
si	Use __FBSDID().	2003-08-24 18:03:45 +00:00
sio	Use __FBSDID().	2003-08-24 18:03:45 +00:00
sk	Prefer new location of pci include files (which have only been in the	2003-08-22 07:20:27 +00:00
smbus	Use __FBSDID().	2003-08-24 18:03:45 +00:00
sn	Use __FBSDID().	2003-08-24 18:03:45 +00:00
snc	Use __FBSDID().	2003-08-24 18:03:45 +00:00
snp	Use __FBSDID().	2003-08-24 18:03:45 +00:00
sound	When present use ogain instead of master for surround sound channels.	2003-08-23 21:39:51 +00:00
speaker	Use __FBSDID().	2003-06-02 16:32:55 +00:00
sr	Use __FBSDID().	2003-08-24 18:17:24 +00:00
stg	Use __FBSDID().	2003-08-24 18:17:24 +00:00
streams	Use __FBSDID().	2003-08-24 18:17:24 +00:00
sym	Use __FBSDID().	2003-08-24 18:17:24 +00:00
syscons	Merge pc98 support from sys/pc98/pc98/syscons.c.	2003-08-25 07:48:42 +00:00
tdfx	Use __FBSDID().	2003-08-24 17:55:58 +00:00
tga	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ti	Prefer new location of pci include files (which have only been in the	2003-08-22 07:20:27 +00:00
trm	Use __FBSDID().	2003-08-24 17:55:58 +00:00
twe	Prefer new location of pci include files (which have only been in the	2003-08-22 07:08:17 +00:00
tx	Use __FBSDID().	2003-08-24 17:55:58 +00:00
txp	Use __FBSDID().	2003-08-24 17:55:58 +00:00
ubsec	Use __FBSDID().	2003-08-24 17:55:58 +00:00
usb	Use __FBSDID().	2003-08-24 17:55:58 +00:00
utopia	Generate events when the carrier goes up or down.	2003-07-30 08:35:58 +00:00
vinum	Use __FBSDID().	2003-08-24 17:55:58 +00:00
vr	Prefer new location of pci include files (which have only been in the	2003-08-22 07:20:27 +00:00
vx	Use __FBSDID().	2003-08-24 17:55:58 +00:00
wds	Use __FBSDID().	2003-08-24 17:55:58 +00:00
wi	This doesn't work, so back them out.	2003-08-24 05:18:10 +00:00
wl	Use __FBSDID().	2003-08-24 17:55:58 +00:00
xe	Use __FBSDID().	2003-08-24 17:55:58 +00:00
zs	Use __FBSDID().	2003-08-24 17:55:58 +00:00