From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 1 Feb 2012 12:19:42 +0000 (+0100)
Subject: merge mainline into ehci
X-Git-Tag: 2.00~726^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cefa01261bb2caca2ccfc0bbe58458d716f55722;p=thirdparty%2Fgrub.git

merge mainline into ehci
---

cefa01261bb2caca2ccfc0bbe58458d716f55722
diff --cc grub-core/Makefile.core.def
index 346ec24ee,02389a163..80054b3da
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -437,19 -462,10 +462,16 @@@ module = 
    enable = pci;
  };
  
 +module = {
 +  name = ehci;
 +  common = bus/usb/ehci.c;
 +  enable = pci;
 +};
 +
  module = {
    name = pci;
-   noemu = bus/pci.c;
-   emu = bus/emu/pci.c;
-   emu = commands/lspci.c;
+   common = bus/pci.c;
  
-   enable = emu;
    enable = i386_pc;
    enable = i386_efi;
    enable = x86_64_efi;