* grub-core/disk/pata.c (grub_pata_initialize) [QEMU_MIPS]: Fix a
mismerge.
This commit is contained in:
parent
ba7df45ee6
commit
5afeb5bdd6
2 changed files with 8 additions and 5 deletions
|
@ -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>
|
2011-06-27 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
Chainloading on coreboot support.
|
Chainloading on coreboot support.
|
||||||
|
|
|
@ -438,15 +438,13 @@ grub_pata_initialize (void)
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static grub_err_t
|
static grub_err_t
|
||||||
grub_ata_initialize (void)
|
grub_pata_initialize (void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < 2; i++)
|
for (i = 0; i < 2; i++)
|
||||||
{
|
{
|
||||||
grub_ata_device_initialize (i, 0, grub_ata_ioaddress[i],
|
grub_pata_device_initialize (i, 0, grub_pata_ioaddress[i]);
|
||||||
grub_ata_ioaddress2[i]);
|
grub_pata_device_initialize (i, 1, grub_pata_ioaddress[i]);
|
||||||
grub_ata_device_initialize (i, 1, grub_ata_ioaddress[i],
|
|
||||||
grub_ata_ioaddress2[i]);
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue