> On Fri, Jun 17, 2016 at 9:40 AM, Marcus Glocker <mar...@nazgul.ch> wrote: > > On Fri, Jun 17, 2016 at 04:53:55AM -0600, Stefan Sperling wrote: > > > >> CVSROOT: /cvs > >> Module name: src > >> Changes by: s...@cvs.openbsd.org 2016/06/17 04:53:55 > >> > >> Modified files: > >> sys/dev/ic : rtwn.c rtwnvar.h > >> sys/dev/pci : if_rtwn.c > >> sys/dev/usb : if_urtwn.c > >> > >> Log message: > >> Merge a lot of code from urtwn(4) into rtwn(4). Both drivers now share code > >> in the file sys/dev/ic/rtwn.c. This reduces kernel bloat and will make it > >> easier to have both drivers benefit from future enhancements. > >> ok mpi@ > > > > I think this breaks archs where urtwn is enabled, but rtwn isn't. > > Looks like a one line file to conf/files: > > --- ./conf/files 3 May 2016 14:52:39 -0000 1.619 > +++ ./conf/files 17 Jun 2016 17:35:57 -0000 > @@ -396,7 +396,7 @@ file dev/ic/rtw.c rtw > > # Realtek RTL8188CE 802.11 > device rtwn: ifnet, wlan, firmload > -file dev/ic/rtwn.c rtwn > +file dev/ic/rtwn.c rtwn | urtwn > > # Ralink RT2500/RT2600 802.11 > device ral: ether, ifnet, ifmedia, firmload, wlan > > > ok?
This helps to build an i386 GENERIC kernel without rtwn. ok jca@
