Subject: Re: i386 MP build error
To: Hubert Feyrer <hubert.feyrer@informatik.fh-regensburg.de>
From: Mihai Chelaru <kefren@netbsd.ro>
List: tech-smp
Date: 05/17/2002 22:55:40
Sure :)
-------
# diff Kefren.MP GENERIC.MP
6c6
< include "arch/i386/conf/Kefren"
---
> include "arch/i386/conf/GENERIC"
15c15
< options MPVERBOSE
---
> #options MPVERBOSE
----------
bash-2.05# diff Kefren GENERIC
1c1
< # $NetBSD: GENERIC,v 1.490 2002/04/25 15:22:44 wiz Exp $
---
> # $NetBSD: GENERIC,v 1.300.2.28 2002/04/27 20:24:44 sommerfeld Exp $
25c25
< #ident "GENERIC-$Revision: 1.491 $"
---
> #ident "GENERIC-$Revision: 1.300.2.29 $"
30,32c30,32
< #options I386_CPU
< #options I486_CPU
< #options I586_CPU
---
> options I386_CPU
> options I486_CPU
> options I586_CPU
36c36
< #options MATH_EMULATE # floating point emulation
---
> options MATH_EMULATE # floating point emulation
65c65
< #options INSECURE # disable kernel security levels
---
> options INSECURE # disable kernel security levels
98,103c98,103
< #options COMPAT_09 # NetBSD 0.9,
< #options COMPAT_10 # NetBSD 1.0,
< #options COMPAT_11 # NetBSD 1.1,
< #options COMPAT_12 # NetBSD 1.2,
< #options COMPAT_13 # NetBSD 1.3,
< #options COMPAT_14 # NetBSD 1.4,
---
> options COMPAT_09 # NetBSD 0.9,
> options COMPAT_10 # NetBSD 1.0,
> options COMPAT_11 # NetBSD 1.1,
> options COMPAT_12 # NetBSD 1.2,
> options COMPAT_13 # NetBSD 1.3,
> options COMPAT_14 # NetBSD 1.4,
105,106c105,106
< #options COMPAT_43 # and 4.3BSD
< #options COMPAT_386BSD_MBRPART # recognize old partition ID
---
> options COMPAT_43 # and 4.3BSD
> options COMPAT_386BSD_MBRPART # recognize old partition ID
109,110c109,110
< #options COMPAT_SVR4 # binary compatibility with SVR4
< #options COMPAT_IBCS2 # binary compatibility with SCO and ISC
---
> options COMPAT_SVR4 # binary compatibility with SVR4
> options COMPAT_IBCS2 # binary compatibility with SCO and ISC
119,120c119,120
< #file-system EXT2FS # second extended file system (linux)
< #file-system LFS # log-structured file system
---
> file-system EXT2FS # second extended file system (linux)
> file-system LFS # log-structured file system
122,123c122,123
< #file-system NFS # Network File System client
< #file-system NTFS # Windows/NT file system (experimental)
---
> file-system NFS # Network File System client
> file-system NTFS # Windows/NT file system (experimental)
125c125
< #file-system MSDOSFS # MS-DOS file system
---
> file-system MSDOSFS # MS-DOS file system
129,130c129,130
< #file-system OVERLAY # overlay file system
< #file-system PORTAL # portal filesystem (still experimental)
---
> file-system OVERLAY # overlay file system
> file-system PORTAL # portal filesystem (still experimental)
132,134c132,134
< #file-system UMAPFS # NULLFS + uid and gid remapping
< #file-system UNION # union file system
< #file-system CODA # Coda File System; also needs vcoda (below)
---
> file-system UMAPFS # NULLFS + uid and gid remapping
> file-system UNION # union file system
> file-system CODA # Coda File System; also needs vcoda (below)
137c137
< #options QUOTA # UFS quotas
---
> options QUOTA # UFS quotas
140c140
< #options NFSSERVER # Network File System server
---
> options NFSSERVER # Network File System server
147c147
< #options INET6 # IPV6
---
> options INET6 # IPV6
152c152
< #options NS # XNS
---
> options NS # XNS
154c154
< #options ISO,TPIP # OSI
---
> options ISO,TPIP # OSI
156,160c156,160
< #options CCITT,LLC,HDLC # X.25
< #options NETATALK # AppleTalk networking protocols
< #options PPP_BSDCOMP # BSD-Compress compression support for PPP
< #options PPP_DEFLATE # Deflate compression support for PPP
< #options PPP_FILTER # Active filter support for PPP (requires bpf)
---
> options CCITT,LLC,HDLC # X.25
> options NETATALK # AppleTalk networking protocols
> options PPP_BSDCOMP # BSD-Compress compression support for PPP
> options PPP_DEFLATE # Deflate compression support for PPP
> options PPP_FILTER # Active filter support for PPP (requires bpf)
172,173c172,173
< #options SCSIVERBOSE # human readable SCSI error messages
< #options USBVERBOSE # verbose USB device autoconfig messages
---
> options SCSIVERBOSE # human readable SCSI error messages
> options USBVERBOSE # verbose USB device autoconfig messages
176,177c176,177
< #options I2OVERBOSE # verbose I2O driver messages
< #options MCAVERBOSE # verbose MCA device autoconfig messages
---
> options I2OVERBOSE # verbose I2O driver messages
> options MCAVERBOSE # verbose MCA device autoconfig messages
179c179
< #options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
---
> options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
215c215,218
< #apm0 at mainbus0 # Advanced power management
---
> cpu* at mainbus?
> #ioapic* at mainbus?
>
> apm0 at mainbus0 # Advanced power management
261,262c264,265
< options PCIBIOS # PCI BIOS support
< options PCIBIOSVERBOSE # PCI BIOS verbose info
---
> #options PCIBIOS # PCI BIOS support
> #options PCIBIOSVERBOSE # PCI BIOS verbose info
291,292c294,295
< #pcmcia* at pcic? controller ? socket ?
< #pcmcia* at tcic? controller ? socket ?
---
> pcmcia* at pcic? controller ? socket ?
> pcmcia* at tcic? controller ? socket ?
295c298
< #mca0 at mainbus?
---
> mca0 at mainbus?
298,301c301,304
< #pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
< #pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
< #pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
< #tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
---
> pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
> pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
> pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
> tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
304c307
< #pcic0 at pci? dev? function ?
---
> pcic0 at pci? dev? function ?
310c313
< #pcic* at isapnp?
---
> pcic* at isapnp?
359,361c362,364
< #com* at puc? port ? # 16x50s on "universal" comm boards
< #cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
< #cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards
---
> com* at puc? port ? # 16x50s on "universal" comm boards
> cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
> cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards
364c367
< #com* at isapnp? # Modems and serial boards
---
> com* at isapnp? # Modems and serial boards
367c370
< #com* at pcmcia? function ? # Modems and serial cards
---
> com* at pcmcia? function ? # Modems and serial cards
369,370c372,373
< #pcmcom* at pcmcia? function ? # PCMCIA multi-port serial
cards
< #com* at pcmcom? slave ? # ...and the slave devices
---
> pcmcom* at pcmcia? function ? # PCMCIA multi-port serial
cards
> com* at pcmcom? slave ? # ...and the slave devices
379c382
< #com2 at isa? port 0x3e8 irq 5
---
> com2 at isa? port 0x3e8 irq 5
398c401
< #com* at mca? slot ? # 16x50s on comm boards
---
> com* at mca? slot ? # 16x50s on comm boards
403c406
< #lpt* at puc? port ? # || ports on "universal" comm boards
---
> lpt* at puc? port ? # || ports on "universal" comm boards
406,408c409,411
< #lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports
< #lpt1 at isa? port 0x278
< #lpt2 at isa? port 0x3bc
---
> lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports
> lpt1 at isa? port 0x278
> lpt2 at isa? port 0x3bc
421,424c424,427
< #iop* at pci? dev ? function ? # I/O processor
< #iopsp* at iop? tid ? # SCSI/FC-AL ports
< #ld* at iop? tid ? # block devices
< #dpti* at iop? tid 0 # DPT/Adaptec control
interface
---
> iop* at pci? dev ? function ? # I/O processor
> iopsp* at iop? tid ? # SCSI/FC-AL ports
> ld* at iop? tid ? # block devices
> dpti* at iop? tid 0 # DPT/Adaptec control interface
430,439c433,442
< #adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
< #adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
< #ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
< #bha* at pci? dev ? function ? # BusLogic 9xx SCSI
< #dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
< #iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
< #isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
< #mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
< #pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
< #siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
---
> adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
> adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
> ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
> bha* at pci? dev ? function ? # BusLogic 9xx SCSI
> dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
> iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
> isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
> mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
> pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
> siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
441c444
< #trm* at pci? dev ? function ? # Tekram DC-395U/UW/F, DC-315/U SCSI
---
> trm* at pci? dev ? function ? # Tekram DC-395U/UW/F, DC-315/U SCSI
444,448c447,451
< #ahb* at eisa? slot ? # Adaptec 174[02] SCSI
< #ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
< #bha* at eisa? slot ? # BusLogic 7xx SCSI
< #dpt* at eisa? slot ? # DPT EATA SCSI
< #uha* at eisa? slot ? # UltraStor 24f SCSI
---
> ahb* at eisa? slot ? # Adaptec 174[02] SCSI
> ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
> bha* at eisa? slot ? # BusLogic 7xx SCSI
> dpt* at eisa? slot ? # DPT EATA SCSI
> uha* at eisa? slot ? # UltraStor 24f SCSI
451,452c454,455
< #aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
< #esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI
---
> aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
> esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI
455,456c458,459
< #aha* at isapnp? # Adaptec AHA-154[02
< #aic* at isapnp? # Adaptec AHA-1520B
---
> aha* at isapnp? # Adaptec AHA-154[02
> aic* at isapnp? # Adaptec AHA-1520B
459,465c462,468
< #adv0 at isa? port ? irq ? drq ? # AdvanSys APB-514[02] SCSI
< #aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI
< #aha1 at isa? port 0x334 irq ? drq ?
< #ahc0 at isa? port ? irq ? # Adaptec 284x SCSI
< #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI
< #bha0 at isa? port 0x330 irq ? drq ? # BusLogic [457]4X SCSI
< #bha1 at isa? port 0x334 irq ? drq ?
---
> adv0 at isa? port ? irq ? drq ? # AdvanSys APB-514[02] SCSI
> aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI
> aha1 at isa? port 0x334 irq ? drq ?
> ahc0 at isa? port ? irq ? # Adaptec 284x SCSI
> aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI
> bha0 at isa? port 0x330 irq ? drq ? # BusLogic [457]4X SCSI
> bha1 at isa? port 0x334 irq ? drq ?
470,474c473,477
< #sea0 at isa? iomem 0xc8000 irq 5 # Seagate/Future Domain SCSI
< #uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI
< #uha1 at isa? port 0x340 irq ? drq ?
< #wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
< #wds1 at isa? port 0x358 irq 11 drq 5
---
> sea0 at isa? iomem 0xc8000 irq 5 # Seagate/Future Domain SCSI
> uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI
> uha1 at isa? port 0x340 irq ? drq ?
> wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
> wds1 at isa? port 0x358 irq 11 drq 5
481c484
< #aha* at mca? slot ? # Adaptec AHA-1640
---
> aha* at mca? slot ? # Adaptec AHA-1640
484,496c487,499
< #scsibus* at adv?
< #scsibus* at adw?
< #scsibus* at aha?
< #scsibus* at ahb?
< #scsibus* at ahc?
< #scsibus* at aic?
< #scsibus* at bha?
< #scsibus* at dpt?
< #scsibus* at esp?
< #scsibus* at iha?
< #scsibus* at iopsp?
< #scsibus* at isp?
< #scsibus* at mly?
---
> scsibus* at adv?
> scsibus* at adw?
> scsibus* at aha?
> scsibus* at ahb?
> scsibus* at ahc?
> scsibus* at aic?
> scsibus* at bha?
> scsibus* at dpt?
> scsibus* at esp?
> scsibus* at iha?
> scsibus* at iopsp?
> scsibus* at isp?
> scsibus* at mly?
498,503c501,506
< #scsibus* at pcscp?
< #scsibus* at sea?
< #scsibus* at siop?
< #scsibus* at trm?
< #scsibus* at uha?
< #scsibus* at wds?
---
> scsibus* at pcscp?
> scsibus* at sea?
> scsibus* at siop?
> scsibus* at trm?
> scsibus* at uha?
> scsibus* at wds?
506,512c509,515
< #sd* at scsibus? target ? lun ? # SCSI disk drives
< #st* at scsibus? target ? lun ? # SCSI tape drives
< #cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
< #ch* at scsibus? target ? lun ? # SCSI autochangers
< #ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices
< #ss* at scsibus? target ? lun ? # SCSI scanners
< #uk* at scsibus? target ? lun ? # SCSI unknown
---
> sd* at scsibus? target ? lun ? # SCSI disk drives
> st* at scsibus? target ? lun ? # SCSI tape drives
> cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
> ch* at scsibus? target ? lun ? # SCSI autochangers
> ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices
> ss* at scsibus? target ? lun ? # SCSI scanners
> uk* at scsibus? target ? lun ? # SCSI unknown
516,528c519,531
< #aac* at pci? dev ? function ? # Adaptec AAC family
< #cac* at eisa? slot ? # Compaq EISA array controllers
< #cac* at pci? dev ? function ? # Compaq PCI array controllers
< #icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID
< #mlx* at pci? dev ? function ? # Mylex DAC960 & DEC SWXCR family
< #mlx* at eisa? slot ? # Mylex DAC960 & DEC SWXCR family
< #twe* at pci? dev ? function ? # 3ware Escalade RAID controllers
<
< #ld* at aac? unit ? # logical disk devices
< #ld* at cac? unit ?
< #ld* at icp? unit ?
< #ld* at twe? unit ?
< #ld* at mlx? unit ?
---
> aac* at pci? dev ? function ? # Adaptec AAC family
> cac* at eisa? slot ? # Compaq EISA array controllers
> cac* at pci? dev ? function ? # Compaq PCI array controllers
> icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID
> mlx* at pci? dev ? function ? # Mylex DAC960 & DEC SWXCR family
> mlx* at eisa? slot ? # Mylex DAC960 & DEC SWXCR family
> twe* at pci? dev ? function ? # 3ware Escalade RAID controllers
>
> ld* at aac? unit ? # logical disk devices
> ld* at cac? unit ?
> ld* at icp? unit ?
> ld* at twe? unit ?
> ld* at mlx? unit ?
530,531c533,534
< #icpsp* at icp? unit ? # SCSI pass-through
< #scsibus* at icpsp?
---
> icpsp* at icp? unit ? # SCSI pass-through
> scsibus* at icpsp?
544c547
< #wdc* at pcmcia? function ?
---
> wdc* at pcmcia? function ?
575,576c578,579
< #st* at atapibus? drive ? flags 0x0000 # ATAPI tape drives
< #uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
---
> st* at atapibus? drive ? flags 0x0000 # ATAPI tape drives
> uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
598,599c601,602
< #edc* at mca? slot ? # IBM ESDI Disk Controllers
< #ed* at edc?
---
> edc* at mca? slot ? # IBM ESDI Disk Controllers
> ed* at edc?
605,609c608,612
< #an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
< #en* at pci? dev ? function ? # ENI/Adaptec ATM
< #ep* at pci? dev ? function ? # 3Com 3c59x
< #epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
< #esh* at pci? dev ? function ? # Essential HIPPI card
---
> an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
> en* at pci? dev ? function ? # ENI/Adaptec ATM
> ep* at pci? dev ? function ? # 3Com 3c59x
> epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
> esh* at pci? dev ? function ? # Essential HIPPI card
611,613c614,616
< #fpa* at pci? dev ? function ? # DEC DEFPA FDDI
< #fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
< #gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
---
> fpa* at pci? dev ? function ? # DEC DEFPA FDDI
> fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
> gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
615,630c618,633
< #le* at pci? dev ? function ? # PCnet-PCI Ethernet
< #lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
< #ne* at pci? dev ? function ? # NE2000-compatible Ethernet
< #ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
< #pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet
< #rtk* at pci? dev ? function ? # Realtek 8129/8139
< #sf* at pci? dev ? function ? # Adaptec AIC-6915 Ethernet
< #sip* at pci? dev ? function ? # SiS 900/DP83815 Ethernet
< #ste* at pci? dev ? function ? # Sundance ST-201 Ethernet
< #stge* at pci? dev ? function ? # Sundance/Tamarack TC9021
Gigabit
< #ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
< #tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
< #tlp* at pci? dev ? function ? # DECchip 21x4x and clones
< #vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
< #wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b)
< #wm* at pci? dev ? function ? # Intel 82543/82544 gigabit
---
> le* at pci? dev ? function ? # PCnet-PCI Ethernet
> lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
> ne* at pci? dev ? function ? # NE2000-compatible Ethernet
> ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
> pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet
> rtk* at pci? dev ? function ? # Realtek 8129/8139
> sf* at pci? dev ? function ? # Adaptec AIC-6915 Ethernet
> sip* at pci? dev ? function ? # SiS 900/DP83815 Ethernet
> ste* at pci? dev ? function ? # Sundance ST-201 Ethernet
> stge* at pci? dev ? function ? # Sundance/Tamarack TC9021 Gigabit
> ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
> tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
> tlp* at pci? dev ? function ? # DECchip 21x4x and clones
> vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
> wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b)
> wm* at pci? dev ? function ? # Intel 82543/82544 gigabit
633,635c636,638
< #ep* at eisa? slot ? # 3Com 3c579 Ethernet
< #fea* at eisa? slot ? # DEC DEFEA FDDI
< #tlp* at eisa? slot ? # DEC DE-425 Ethernet
---
> ep* at eisa? slot ? # 3Com 3c579 Ethernet
> fea* at eisa? slot ? # DEC DEFEA FDDI
> tlp* at eisa? slot ? # DEC DE-425 Ethernet
638,641c641,644
< #an* at isapnp? # Aironet 802.11
< #ep* at isapnp? # 3Com 3c509 Ethernet
< #ne* at isapnp? # NE2000-compatible Ethernet
< #tr* at isapnp? # IBM/3COM TROPIC Token-Ring
---
> an* at isapnp? # Aironet 802.11
> ep* at isapnp? # 3Com 3c509 Ethernet
> ne* at isapnp? # NE2000-compatible Ethernet
> tr* at isapnp? # IBM/3COM TROPIC Token-Ring
644,651c647,654
< #an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
< #awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS)
< #cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
< #ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
< #mbe* at pcmcia? function ? # MB8696x based Ethernet
< #ne* at pcmcia? function ? # NE2000-compatible Ethernet
< #ray* at pcmcia? function ? # Raytheon Raylink (802.11)
< #sm* at pcmcia? function ? # Megahertz Ethernet
---
> an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
> awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS)
> cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
> ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
> mbe* at pcmcia? function ? # MB8696x based Ethernet
> ne* at pcmcia? function ? # NE2000-compatible Ethernet
> ray* at pcmcia? function ? # Raytheon Raylink (802.11)
> sm* at pcmcia? function ? # Megahertz Ethernet
654,655c657,658
< #wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
< #xi* at pcmcia? function ? # Xircom CreditCard Ethernet
---
> wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
> xi* at pcmcia? function ? # Xircom CreditCard Ethernet
657,659c660,662
< #mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem
combo cards
< #com* at mhzc?
< #sm* at mhzc?
---
> mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
> com* at mhzc?
> sm* at mhzc?
662,673c665,676
< #ate0 at isa? port 0x2a0 irq ? # AT1700
< #cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
< #ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
< #eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
< #el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
< #ep* at isa? port ? irq ? # 3C509 ethernet cards
< #ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
< #ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
< #fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
< #ix0 at isa? port 0x300 irq 10 # EtherExpress/16
< #iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
< #lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
---
> ate0 at isa? port 0x2a0 irq ? # AT1700
> cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
> ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
> eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
> el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
> ep* at isa? port ? irq ? # 3C509 ethernet cards
> ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
> ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
> fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
> ix0 at isa? port 0x300 irq 10 # EtherExpress/16
> iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
> lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
676,677c679,680
< #nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
< #le* at nele?
---
> nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
> le* at nele?
679,688c682,691
< #bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
< #le* at bicc?
< #ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
< #ne1 at isa? port 0x300 irq 10
< #sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
< #tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
< #tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
< #tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
< #we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
< #we1 at isa? port 0x300 iomem 0xcc000 irq 10
---
> bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
> le* at bicc?
> ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
> ne1 at isa? port 0x300 irq 10
> sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
> tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
> tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
> tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
> we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
> we1 at isa? port 0x300 iomem 0xcc000 irq 10
697,703c700,706
< #elmc* at mca? slot ? # 3Com EtherLink/MC (3c523)
< #ep* at mca? slot ? # 3Com EtherLink III (3c529)
< #we* at mca? slot ? # WD/SMC Ethernet
< #ate* at mca? slot ? # Allied Telesis AT1720
< #ne* at mca? slot ? # Novell NE/2 and clones
< #tr* at mca? slot ? # IBM Token Ring adapter
< #le* at mca? slot ? # SKNET Personal/MC2+
---
> elmc* at mca? slot ? # 3Com EtherLink/MC (3c523)
> ep* at mca? slot ? # 3Com EtherLink III (3c529)
> we* at mca? slot ? # WD/SMC Ethernet
> ate* at mca? slot ? # Allied Telesis AT1720
> ne* at mca? slot ? # Novell NE/2 and clones
> tr* at mca? slot ? # IBM Token Ring adapter
> le* at mca? slot ? # SKNET Personal/MC2+
706,707c709,710
< #acphy* at mii? phy ? # DAltima AC101 and AMD
Am79c874 PHYs
< #amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
---
> acphy* at mii? phy ? # DAltima AC101 and AMD
Am79c874 PHYs
> amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
709,727c712,730
< #brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
< #dmphy* at mii? phy ? # Davicom DM9101 PHYs
< #exphy* at mii? phy ? # 3Com internal PHYs
< #glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
< #gphyter* at mii? phy ? # NS83861 Gig-E PHY
< #icsphy* at mii? phy ? # Integrated Circuit Systems
ICS189x
< #inphy* at mii? phy ? # Intel 82555 PHYs
< #iophy* at mii? phy ? # Intel 82553 PHYs
< #lxtphy* at mii? phy ? # Level One LXT-970 PHYs
< #makphy* at mii? phy ? # Marvell Semiconductor
88E1000 PHYs
< #nsphy* at mii? phy ? # NS83840 PHYs
< #nsphyter* at mii? phy ? # NS83843 PHYs
< #pnaphy* at mii? phy ? # generic HomePNA PHYs
< #qsphy* at mii? phy ? # Quality Semiconductor
QS6612 PHYs
< #sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
< #tlphy* at mii? phy ? # ThunderLAN PHYs
< #tqphy* at mii? phy ? # TDK Semiconductor PHYs
< #ukphy* at mii? phy ? # generic unknown PHYs
< #urlphy* at mii? phy ? # Realtek RTL8150L internal
PHYs
---
> brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
> dmphy* at mii? phy ? # Davicom DM9101 PHYs
> exphy* at mii? phy ? # 3Com internal PHYs
> glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
> gphyter* at mii? phy ? # NS83861 Gig-E PHY
> icsphy* at mii? phy ? # Integrated Circuit Systems
ICS189x
> inphy* at mii? phy ? # Intel 82555 PHYs
> iophy* at mii? phy ? # Intel 82553 PHYs
> lxtphy* at mii? phy ? # Level One LXT-970 PHYs
> makphy* at mii? phy ? # Marvell Semiconductor
88E1000 PHYs
> nsphy* at mii? phy ? # NS83840 PHYs
> nsphyter* at mii? phy ? # NS83843 PHYs
> pnaphy* at mii? phy ? # generic HomePNA PHYs
> qsphy* at mii? phy ? # Quality Semiconductor
QS6612 PHYs
> sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
> tlphy* at mii? phy ? # ThunderLAN PHYs
> tqphy* at mii? phy ? # TDK Semiconductor PHYs
> ukphy* at mii? phy ? # generic unknown PHYs
> urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
735,736c738,739
< #ohci* at pci? dev ? function ? # Open Host Controller
< #uhci* at pci? dev ? function ? # Universal Host Controller
(Intel)
---
> ohci* at pci? dev ? function ? # Open Host Controller
> uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
744,745c747,748
< #usb* at ohci?
< #usb* at uhci?
---
> usb* at ohci?
> usb* at uhci?
748,749c751,752
< #uhub* at usb?
< #uhub* at uhub? port ? configuration ? interface ?
---
> uhub* at usb?
> uhub* at uhub? port ? configuration ? interface ?
752c755
< #uhidev* at uhub? port ? configuration ? interface ?
---
> uhidev* at uhub? port ? configuration ? interface ?
755,756c758,759
< #ums* at uhidev? reportid ?
< #wsmouse* at ums? mux 0
---
> ums* at uhidev? reportid ?
> wsmouse* at ums? mux 0
759,760c762,763
< #ukbd* at uhidev? reportid ?
< #wskbd* at ukbd? console ? mux 1
---
> ukbd* at uhidev? reportid ?
> wskbd* at ukbd? console ? mux 1
763c766
< #uhid* at uhidev? reportid ?
---
> uhid* at uhidev? reportid ?
766c769
< #ulpt* at uhub? port ? configuration ? interface ?
---
> ulpt* at uhub? port ? configuration ? interface ?
769,770c772,773
< #umodem* at uhub? port ? configuration ?
< #ucom* at umodem?
---
> umodem* at uhub? port ? configuration ?
> ucom* at umodem?
773,775c776,778
< #umass* at uhub? port ? configuration ? interface ?
< #atapibus* at umass? channel ?
< #scsibus* at umass? channel ?
---
> umass* at uhub? port ? configuration ? interface ?
> atapibus* at umass? channel ?
> scsibus* at umass? channel ?
779c782
< #uaudio* at uhub? port ? configuration ?
---
> uaudio* at uhub? port ? configuration ?
782c785
< #umidi* at uhub? port ? configuration ?
---
> umidi* at uhub? port ? configuration ?
786,787c789,790
< #uirda* at uhub? port ? configuration ? interface ?
< #irframe* at uirda?
---
> uirda* at uhub? port ? configuration ? interface ?
> irframe* at uirda?
790,791c793,794
< #ustir* at uhub? port ?
< #irframe* at ustir?
---
> ustir* at uhub? port ?
> irframe* at ustir?
794,797c797,800
< #aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
< #cue* at uhub? port ? # CATC USB-EL1201A based adapters
< #kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
< #url* at uhub? port ? # Realtek RTL8150L based adapters
---
> aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
> cue* at uhub? port ? # CATC USB-EL1201A based adapters
> kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
> url* at uhub? port ? # Realtek RTL8150L based adapters
800c803
< #upl* at uhub? port ?
---
> upl* at uhub? port ?
803,804c806,807
< #uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
< #ucom* at uftdi? portno ?
---
> uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
> ucom* at uftdi? portno ?
806,807c809,810
< #umct* at uhub? port ? # MCT USB-RS232 serial adapter
< #ucom* at umct? portno ?
---
> umct* at uhub? port ? # MCT USB-RS232 serial adapter
> ucom* at umct? portno ?
809,810c812,813
< #uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
< #ucom* at uplcom? portno ?
---
> uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
> ucom* at uplcom? portno ?
812,813c815,816
< #uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial
adapter
< #ucom* at uvscom? portno ?
---
> uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial
adapter
> ucom* at uvscom? portno ?
816c819
< #urio* at uhub? port ?
---
> urio* at uhub? port ?
819,820c822,823
< #uvisor* at uhub? port ?
< #ucom* at uvisor?
---
> uvisor* at uhub? port ?
> ucom* at uvisor?
823c826
< #uscanner* at uhub? port ?
---
> uscanner* at uhub? port ?
826,827c829,830
< #usscanner* at uhub? port ?
< #scsibus* at usscanner? channel ?
---
> usscanner* at uhub? port ?
> scsibus* at usscanner? channel ?
830c833
< #uyap* at uhub? port ?
---
> uyap* at uhub? port ?
833,834c836,837
< #udsbr* at uhub? port ?
< #radio* at udsbr?
---
> udsbr* at uhub? port ?
> radio* at udsbr?
837c840
< #ugen* at uhub? port ?
---
> ugen* at uhub? port ?
843,844c846,847
< #oboe* at pci? dev ? function ?
< #irframe* at oboe?
---
> oboe* at pci? dev ? function ?
> irframe* at oboe?
850,864c853,867
< #auich* at pci? dev ? function ? # Intel ICH integrated AC'97
Audio
< #autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97
Audio
< #auvia* at pci? dev ? function ? # VIA VT82C686A integrated
AC'97 Audio
< #clcs* at pci? dev ? function ? # Cirrus Logic CS4280
< #clct* at pci? dev ? function ? # Cirrus Logic CS4281
< #cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
< #eap* at pci? dev ? function ? # Ensoniq AudioPCI
< #emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
< #esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
< #esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio
Accelerator
< #eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
< #fms* at pci? dev ? function ? # Forte Media FM801
< #neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio
< #sv* at pci? dev ? function ? # S3 SonicVibes
< #yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio
---
> auich* at pci? dev ? function ? # Intel ICH integrated AC'97
Audio
> autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97
Audio
> auvia* at pci? dev ? function ? # VIA VT82C686A integrated
AC'97 Audio
> clcs* at pci? dev ? function ? # Cirrus Logic CS4280
> clct* at pci? dev ? function ? # Cirrus Logic CS4281
> cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
> eap* at pci? dev ? function ? # Ensoniq AudioPCI
> emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
> esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
> esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio
Accelerator
> eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
> fms* at pci? dev ? function ? # Forte Media FM801
> neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio
> sv* at pci? dev ? function ? # S3 SonicVibes
> yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio
867,871c870,874
< #ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
< #guspnp* at isapnp? # Gravis Ultra Sound PnP audio
< #sb* at isapnp? # SoundBlaster-compatible audio
< #wss* at isapnp? # Windows Sound System
< #ym* at isapnp? # Yamaha OPL3-SA3 audio
---
> ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
> guspnp* at isapnp? # Gravis Ultra Sound PnP audio
> sb* at isapnp? # SoundBlaster-compatible audio
> wss* at isapnp? # Windows Sound System
> ym* at isapnp? # Yamaha OPL3-SA3 audio
877,878c880,881
< #gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound
< #pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
---
> gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound
> pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
881,882c884,885
< #sb0 at isa? port 0x220 irq 5 drq 1 drq2 5 # SoundBlaster
< #wss0 at isa? port 0x530 irq 10 drq 0 drq2 1 # Windows Sound System
---
> sb0 at isa? port 0x220 irq 5 drq 1 drq2 5 # SoundBlaster
> wss0 at isa? port 0x530 irq 10 drq 0 drq2 1 # Windows Sound System
891c894
< #opl* at cmpci? flags 1
---
> opl* at cmpci? flags 1
893,900c896,903
< #opl* at eso?
< #opl* at ess?
< #opl* at fms?
< #opl* at sb?
< #opl* at sv?
< #opl* at wss?
< #opl* at yds?
< #opl* at ym?
---
> opl* at eso?
> opl* at ess?
> opl* at fms?
> opl* at sb?
> opl* at sv?
> opl* at wss?
> opl* at yds?
> opl* at ym?
904,912c907,915
< #audio* at auich?
< #audio* at autri?
< #audio* at auvia?
< #audio* at clcs?
< #audio* at clct?
< #audio* at cmpci?
< #audio* at eap?
< #audio* at emuxki?
< #audio* at esa?
---
> audio* at auich?
> audio* at autri?
> audio* at auvia?
> audio* at clcs?
> audio* at clct?
> audio* at cmpci?
> audio* at eap?
> audio* at emuxki?
> audio* at esa?
914,922c917,925
< #audio* at esm?
< #audio* at eso?
< #audio* at ess?
< #audio* at fms?
< #audio* at gus?
< #audio* at guspnp?
< #audio* at neo?
< #audio* at pas?
< #audio* at sb?
---
> audio* at esm?
> audio* at eso?
> audio* at ess?
> audio* at fms?
> audio* at gus?
> audio* at guspnp?
> audio* at neo?
> audio* at pas?
> audio* at sb?
924,928c927,931
< #audio* at sv?
< #audio* at uaudio?
< #audio* at wss?
< #audio* at yds?
< #audio* at ym?
---
> audio* at sv?
> audio* at uaudio?
> audio* at wss?
> audio* at yds?
> audio* at ym?
932,937c935,940
< #mpu* at cmpci?
< #mpu* at eso?
< #mpu* at fms?
< #mpu* at sb?
< #mpu* at yds?
< #mpu* at ym?
---
> mpu* at cmpci?
> mpu* at eso?
> mpu* at fms?
> mpu* at sb?
> mpu* at yds?
> mpu* at ym?
940,941c943,944
< #midi* at autri? # Trident 4DWAVE MIDI port
< #midi* at clcs? # Cirrus Logic CS4280 MIDI port
---
> midi* at autri? # Trident 4DWAVE MIDI port
> midi* at clcs? # Cirrus Logic CS4280 MIDI port
944,949c947,952
< #midi* at eap? # 137[01] MIDI port
< #midi* at mpu? # MPU 401
< #midi* at opl? # OPL FM synth
< #midi* at pcppi? # MIDI interface to the PC speaker
< #midi* at sb? # SB1 MIDI port
< #midi* at umidi? # USB MIDI
---
> midi* at eap? # 137[01] MIDI port
> midi* at mpu? # MPU 401
> midi* at opl? # OPL FM synth
> midi* at pcppi? # MIDI interface to the PC speaker
> midi* at sb? # SB1 MIDI port
> midi* at umidi? # USB MIDI
981,982c984,985
< #bktr* at pci? dev ? function ?
< #radio* at bktr?
---
> bktr* at pci? dev ? function ?
> radio* at bktr?
988,993c991,996
< #lms0 at isa? port 0x23c irq 5 # Logitech bus mouse
< #lms1 at isa? port 0x238 irq 5
< #mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
< #mms1 at isa? port 0x238 irq 5
< #wsmouse* at lms? mux 0
< #wsmouse* at mms? mux 0
---
> lms0 at isa? port 0x23c irq 5 # Logitech bus mouse
> lms1 at isa? port 0x238 irq 5
> mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
> mms1 at isa? port 0x238 irq 5
> wsmouse* at lms? mux 0
> wsmouse* at mms? mux 0
1006c1009
< #joy* at isapnp? # Game ports (usually on audio cards)
---
> joy* at isapnp? # Game ports (usually on audio cards)
1009,1010c1012,1013
< #joy* at pci? # Game ports (usually on audio cards)
< #joy* at eso? # ESS Solo-1 on-board joystick
---
> joy* at pci? # Game ports (usually on audio cards)
> joy* at eso? # ESS Solo-1 on-board joystick
1023c1026
< #weasel* at pci?
---
> weasel* at pci?
1026c1029
< #include "arch/i386/conf/GENERIC.local"
---
> include "arch/i386/conf/GENERIC.local"
1032c1035,1036
< #pseudo-device ccd 4 # concatenated/striped disk
devices
---
> pseudo-device ccd 4 # concatenated/striped disk devices
> # RAIDframe is broken with MULTIPROCESSOR / LOCKDEBUG
1042a1047
>
1050,1054c1055,1059
< #pseudo-device ppp 2 # Point-to-Point Protocol
< #pseudo-device pppoe # PPP over Ethernet (RFC 2516)
< #pseudo-device sl 2 # Serial Line IP
< #pseudo-device strip 2 # Starmode Radio IP (Metricom)
< #pseudo-device irframetty # IrDA frame line discipline
---
> pseudo-device ppp 2 # Point-to-Point Protocol
> pseudo-device pppoe # PPP over Ethernet (RFC 2516)
> pseudo-device sl 2 # Serial Line IP
> pseudo-device strip 2 # Starmode Radio IP (Metricom)
> pseudo-device irframetty # IrDA frame line discipline
1061c1066
< #pseudo-device bridge # simple inter-network
bridging
---
> pseudo-device bridge # simple inter-network bridging
1072c1077
< #pseudo-device vcoda 4 # coda minicache <-> venus
comm.
---
> pseudo-device vcoda 4 # coda minicache <-> venus comm.
On Friday 17 May 2002 22:45, Hubert Feyrer wrote:
>
> Only a diff between your kernel config and GENERIC.MP can tell.
>
>
> - Hubert