Changeset a1e2df13 in mainline for boot/arch/amd64/Makefile.inc

Timestamp:

2012-11-11T21:31:03Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25eec4ef

Parents:

141a20d (diff), d1538a1 (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/amd64/Makefile.inc (modified) (1 diff)

boot/arch/amd64/Makefile.inc

@@ -42 +42 @@
         char/ps2mouse \
         char/xtkbd \
+        time/cmos-rtc \
         bus/usb/ehci\
         bus/usb/ohci \