[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

More power patches



On Thu, 8 Jan 2004, Lukas Ertl wrote:

> On Wed, 7 Jan 2004, M. Warner Losh wrote:
>
> > I've updated the power patches.  This includes the
> > transparent/secondary bridge support and tweaks to the last version.
>
> this doesn't apply cleanly:
>
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |diff -ur sys/dev/ppbus/ppb_base.c sys/dev/ppbus/ppb_base.c
> |--- sys/dev/ppbus/ppb_base.c   Sat Sep 20 21:53:13 2003
> |+++ sys/dev/ppbus/ppb_base.c   Thu Jan  1 10:00:15 2004
> --------------------------
> Patching file sys/dev/ppbus/ppb_base.c using Plan A...
> Reversed (or previously applied) patch detected!  Assume -R? [y]

Plus (after removing that part from the diff), it doesn't compile:

mkdep -f .depend -a   -nostdinc -D_KERNEL -DKLD_MODULE -I- -I. -I@
-I@/../include -I/usr/obj/usr/src/i386/usr/include
-I/usr/obj/usr/src/sys/KORBEN  /usr/src/sys/modules/ste/../../pci/if_ste.c
/usr/src/sys/pci/if_ste.c:926:1: unterminated #ifndef
mkdep: compile failed
*** Error code 1

Stop in /usr/src/sys/modules/ste.
*** Error code 1

regards,
le

-- 
Lukas Ertl                             eMail: l_(_dot_)_ertl_(_at_)_univie_(_dot_)_ac_(_dot_)_at
UNIX Systemadministrator               Tel.:  (+43 1) 4277-14073
Vienna University Computer Center      Fax.:  (+43 1) 4277-9140
University of Vienna                   http://mailbox.univie.ac.at/~le/