merged mainline into PCI

diff --cc Makefile.in
index 1733f1c0149a73f09e6483f78e2685512ce7eef3,d9f107bef69e0b3a22774938366827eda86b78db..5654a89f77216d6ce3ec6745bc2a2d771c3457a4
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -100,9 -107,8 +107,9 @@@ endi
  AWK = @AWK@
  LIBCURSES = @LIBCURSES@
  LIBUSB = @LIBUSB@
 +LIBPCIACCESS = @LIBPCIACCESS@
  YACC = @YACC@
- UNIFONT_BDF = @UNIFONT_BDF@
+ FONT_SOURCE = @FONT_SOURCE@
  
  # Options.
  enable_grub_emu = @enable_grub_emu@

diff --cc conf/i386-pc.rmk
index e4b89a8b9f85a175de2892e91b063ce8c61b229c,e1688ccd5d14a66d97119bb25dafa9234d599375..d343c8be8ae65192b08ccbf35692619e502af37e
--- 1/conf/i386-pc.rmk
--- 2/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -165,30 -166,24 +166,29 @@@ grub_emu_LDFLAGS = $(LIBCURSES
  ifeq ($(enable_grub_emu_usb), yes)
  grub_emu_SOURCES += disk/usbms.c util/usb.c bus/usb/usb.c     \
                commands/usbtest.c
 -grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB)
 +grub_emu_LDFLAGS += $(LIBUSB)
 +endif
 +
 +ifeq ($(enable_grub_emu_pci), yes)
 +grub_emu_SOURCES += util/pci.c commands/lspci.c
 +grub_emu_LDFLAGS += $(LIBPCIACCESS)
  endif
  
- # Scripts.
- sbin_SCRIPTS = grub-install
- bin_SCRIPTS = grub-mkrescue
+ sbin_SCRIPTS += grub-install
+ grub_install_SOURCES = util/grub-install.in
  
- # For grub-install.
- grub_install_SOURCES = util/i386/pc/grub-install.in
+ bin_SCRIPTS += grub-mkrescue
+ grub_mkrescue_SOURCES = util/grub-mkrescue.in
  
- # For grub-mkrescue.
- grub_mkrescue_SOURCES = util/i386/pc/grub-mkrescue.in
+ bin_SCRIPTS += grub-mkfloppy
+ grub_mkfloppy_SOURCES = util/i386/pc/grub-mkfloppy.in
  
- pkglib_MODULES = biosdisk.mod chain.mod \
-       multiboot.mod reboot.mod halt.mod       \
-       vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod     \
-       ata.mod vga.mod memdisk.mod pci.mod lspci.mod   \
-       aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod \
-       datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod \
+ pkglib_MODULES = biosdisk.mod chain.mod                               \
+       multiboot.mod reboot.mod halt.mod                               \
+       vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod             \
+       vga.mod memdisk.mod pci.mod lspci.mod                           \
+       aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod       \
+       datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod                \
        usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod usb_keyboard.mod \
        efiemu.mod mmap.mod acpi.mod drivemap.mod
  

diff --cc configure.ac
Simple merge

diff --cc disk/ata.c
Simple merge