Changeset 6ef2c11 in mainline for boot/arch/amd64


Ignore:
Timestamp:
2010-01-06T20:33:50Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
385a3d6
Parents:
4da7d79 (diff), 23efd30 (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r4da7d79 r6ef2c11  
    3030
    3131RD_SRVS += \
    32         $(USPACEDIR)/srv/pci/pci \
    3332        $(USPACEDIR)/srv/bd/ata_bd/ata_bd \
    34         $(USPACEDIR)/srv/char/i8042/i8042 \
    35         $(USPACEDIR)/srv/mouse/c_mouse/c_mouse
     33        $(USPACEDIR)/srv/hw/char/i8042/i8042 \
     34        $(USPACEDIR)/srv/hw/bus/pci/pci \
     35        $(USPACEDIR)/srv/hid/c_mouse/c_mouse
    3636
    3737MODULES := $(notdir $(COMPONENTS))
Note: See TracChangeset for help on using the changeset viewer.