Changeset 04cb68f2 in mainline for boot/arch


Ignore:
Timestamp:
2010-10-20T19:30:54Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
78a9e5ef
Parents:
e0e568ff (diff), a6e54c5d (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:

Merge from lp:~helenos-dd/helenos/dd.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    re0e568ff r04cb68f2  
    3737        $(USPACE_PATH)/srv/hid/char_mouse/char_ms
    3838
     39RD_DRVS += \
     40        rootia32 \
     41        pciintel \
     42        isa \
     43        ns8250
     44       
     45RD_DRV_CFG += \
     46        isa/isa.dev
     47
    3948BOOT_OUTPUT = $(ROOT_PATH)/image.iso
    4049PREBUILD = $(INITRD).img
Note: See TracChangeset for help on using the changeset viewer.