Changeset 52cdcbc in mainline

Timestamp:

2010-01-10T22:34:12Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c03f610

Parents:

d9ee2ea (diff), ed212f7 (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 possible fix for i460GX keyboard regression. (ticket #159)

File:

• boot/arch/ia64/loader/Makefile.build (modified) (1 diff)

boot/arch/ia64/loader/Makefile.build

@@ -49 +49 @@
         boot.S
 
+ifeq ($(MACHINE),i460GX)
+        RD_APPS += \
+                $(USPACEDIR)/srv/hw/char/i8042/i8042 \
+                $(USPACEDIR)/srv/hid/c_mouse/c_mouse
+endif
+
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 COMPONENT_OBJECTS := $(addsuffix .co,$(basename $(notdir $(COMPONENTS)))) $(INITRD).co