Could you merge two patches?

В Thu, 28 May 2015 20:03:38 +0200
Paul Menzel <paulepan...@users.sourceforge.net> пишет:

> Date: Thu, 28 May 2015 19:50:51 +0200
> 
> Using the macros the line is too long, so wrap it.
> ---
>  grub-core/disk/ahci.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
> index 0825998..fa7aa88 100644
> --- a/grub-core/disk/ahci.c
> +++ b/grub-core/disk/ahci.c
> @@ -552,7 +552,9 @@ grub_ahci_pciinit (grub_pci_device_t dev,
>                     adevs[i]->hba->ports[adevs[i]->port].sata_error);
>  
>       adevs[i]->hba->ports[adevs[i]->port].command
> -       = (adevs[i]->hba->ports[adevs[i]->port].command & 0x0fffffff) | (1 << 
> 28) | GRUB_AHCI_HBA_PORT_CMD_SPIN_UP | GRUB_AHCI_HBA_PORT_CMD_POWER_ON;
> +       = (adevs[i]->hba->ports[adevs[i]->port].command & 0x0fffffff) | (1 << 
> 28)
> +       | GRUB_AHCI_HBA_PORT_CMD_SPIN_UP
> +       | GRUB_AHCI_HBA_PORT_CMD_POWER_ON;
>  
>       /*  struct grub_disk_ata_pass_through_parms parms2;
>           grub_memset (&parms2, 0, sizeof (parms2));

Attachment: pgpdsnJUbbib1.pgp
Description: OpenPGP digital signature

_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to