* grub-core/disk/pata.c (grub_pata_initialize) [QEMU_MIPS]: Fix a

	mismerge.

diff --git a/ChangeLog b/ChangeLog
index 9922f2a2b644bc397006971c39a022481d2de5f7..a9dacd42b78e876cbe5d9528e4139a4651808267 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/pata.c (grub_pata_initialize) [QEMU_MIPS]: Fix a
+       mismerge.
+
 2011-06-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Chainloading on coreboot support.

diff --git a/grub-core/disk/pata.c b/grub-core/disk/pata.c
index ac3b91a41f06ecf6ac0f7b63bd9eaeb672a53968..95828e8f63c2b8c4b58f18b05bd04d88e174a521 100644 (file)
--- a/grub-core/disk/pata.c
+++ b/grub-core/disk/pata.c
@@ -438,15 +438,13 @@ grub_pata_initialize (void)
 }
 #else
 static grub_err_t
-grub_ata_initialize (void)
+grub_pata_initialize (void)
 {
   int i;
   for (i = 0; i < 2; i++)
     {
-      grub_ata_device_initialize (i, 0, grub_ata_ioaddress[i],
-                                 grub_ata_ioaddress2[i]);
-      grub_ata_device_initialize (i, 1, grub_ata_ioaddress[i],
-                                 grub_ata_ioaddress2[i]);
+      grub_pata_device_initialize (i, 0, grub_pata_ioaddress[i]);
+      grub_pata_device_initialize (i, 1, grub_pata_ioaddress[i]);
     }
   return 0;
 }