Changeset fe2333d in mainline for boot

Timestamp:

2010-12-09T00:08:57Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a5a950

Parents:

07b9203e (diff), c01f8e6 (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

Location:

boot

Files:

• Makefile.common (modified) (1 diff)
• arch/amd64/Makefile.inc (modified) (1 diff)

boot/Makefile.common

@@ -111 +111 @@
 RD_DRVS = \
         root \
+        rootvirt \
+        test1 \
+        test2 \
         vhc
 

boot/arch/amd64/Makefile.inc

@@ -37 +37 @@
 
 RD_DRVS += \
-        rootia32 \
+        rootpc \
         pciintel \
         isa \