Teemu Rinta-aho <teemu.rinta-aho@nomadiclab.com> wrote:
>I just updated the netbsd-1-5 branch from
>anoncvs.netbsd.org but I can not compile the
>kernel on my laptop. See the following:
>
>cc  -O2 -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes
>-Wpointer-arith -Wno-uninitialized -Wno-main -I. -I../../../../arch
>-I../../../.. -nostdinc -DLKM -DMAXUSERS=32 -D_KERNEL -Di386  -c
>../../../../dev/cardbus/if_rtk_cardbus.c
>../../../../dev/cardbus/if_rtk_cardbus.c:110:
>`CARDBUS_PRODUCT_REALTEK_RT8139' undeclared here (not in a function)
>../../../../dev/cardbus/if_rtk_cardbus.c:110: initializer element for
>`rtk_cardbus_devs[3].rtk_did' is not constant
>*** Error code 1
>
>Stop.

I encountered this too.  It's basically a pullup merge botch by cvs.
What happened is that the latest pullup (1.10.2.2) included a pullup
of 1.13, which, along with adding a couple of new devices, also
deleted an extra blank line at the end of the file.  However, due to
a previous pullup of a later trunk revision (1.19), that line was not
blank, but contained the RT8139 identifier.  Unfortunately, CVS didn't
catch the conflict, and happily deleted the line.

Apply the following patch fragment to your sys/dev/cardbus/cardbusdevs
and regen (make -f Makefile.cardbusdevs):

@@ -103,3 +103,4 @@
 
 /* Realtek (Creative Labs?) products */
 product REALTEK RT8138 0x8138  8138 Ethernet
+product REALTEK RT8139 0x8139  8139 Ethernet

(I'll send a patch request to releng later today if this hasn't
been fixed by then...)

jdarrow

-- 
John Darrow - Senior Technical Specialist               Office: 630/752-5201
Computing Services, Wheaton College, Wheaton, IL 60187  Fax:    630/752-5968
Pager via email: 6303160707@alphapage.airtouch.com      Pager:  630/316-0707
Email: John.P.Darrow@wheaton.edu (plain text please, no HTML or proprietary)