merge mainline into setpci

diff --cc conf/i386.rmk
index 2c1edf62f22ccf9f1214cefd893ae4a2eebdb8ee,88b06aded544b020dda14cd2ac0f13e4b90d9b74..d240858fe3307c0eb4ad6059325168f0f1e359eb
--- 1/conf/i386.rmk
--- 2/conf/i386.rmk
+++ b/conf/i386.rmk
@@@ -26,8 -26,18 +26,24 @@@ ata_mod_SOURCES = disk/ata.
  ata_mod_CFLAGS = $(COMMON_CFLAGS)
  ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
 +# For setpci.mod
 +pkglib_MODULES += setpci.mod
 +setpci_mod_SOURCES = commands/setpci.c
 +setpci_mod_CFLAGS = $(COMMON_CFLAGS)
 +setpci_mod_LDFLAGS = $(COMMON_LDFLAGS)
++
+ pkglib_MODULES += multiboot.mod
+ multiboot_mod_SOURCES = loader/i386/multiboot.c \
+                       loader/i386/multiboot_mbi.c \
+                         loader/multiboot_loader.c
+ multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
+ multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
+ 
+ pkglib_MODULES += multiboot2.mod
+ multiboot2_mod_SOURCES = loader/i386/multiboot.c \
+                        loader/i386/multiboot_mbi.c \
+                          loader/multiboot_loader.c
+ multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
+ multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)