Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-02-12T14:09:22Z (12 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged the actual head

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/loader/Makefile.common

    r918e9910 r827d73f  
    3131#
    3232
     33include ../../../../Makefile.config
    3334include ../../../Makefile.common
    3435
    3536DEPEND = Makefile.depend
    3637DEPEND_PREV = $(DEPEND).prev
     38JOB = image.job
    3739OUTPUT = image.boot
    3840HELLO = hello.efi
     
    4345KERNELDIR = ../../../../kernel
    4446USPACEDIR = ../../../../uspace
     47
     48ifeq ($(MACHINE),i460GX)
     49        RD_SRVS += \
     50                $(USPACEDIR)/srv/hw/char/i8042/i8042 \
     51                $(USPACEDIR)/srv/hid/char_mouse/char_ms
     52endif
Note: See TracChangeset for help on using the changeset viewer.