Changeset 383ddd6 in mainline for boot/arch/ia64/loader/Makefile.common

Timestamp:

2010-01-20T20:33:55Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

975e7e9

Parents:

6c01702 (diff), 3c081d0e (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:

• boot/arch/ia64/loader/Makefile.common (modified) (2 diffs)

boot/arch/ia64/loader/Makefile.common

@@ -31 +31 @@
 #
 
+include ../../../../Makefile.config
 include ../../../Makefile.common
 
@@ -44 +45 @@
 KERNELDIR = ../../../../kernel
 USPACEDIR = ../../../../uspace
+
+ifeq ($(MACHINE),i460GX)
+        RD_SRVS += \
+                $(USPACEDIR)/srv/hw/char/i8042/i8042 \
+                $(USPACEDIR)/srv/hid/c_mouse/c_mouse
+endif