diff --git a/ChangeLog b/ChangeLog
index 9922f2a2b..a9dacd42b 100644
--- 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 ac3b91a41..95828e8f6 100644
--- 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;
 }