From 05bf61044045857f4d15d4f901c9506e5b7a60ff Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 21 Feb 2012 10:38:43 -0800 Subject: [PATCH] --- yaml --- r: 294050 b: refs/heads/master c: 55d5ec316627b64c3764e4c1b4b8e1988e272c1f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 2 -- trunk/drivers/ata/ahci.h | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 32d2dc77646f..9b8e049732e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66583c9fa63d05d5580e409f9a58d3cad6d76d17 +refs/heads/master: 55d5ec316627b64c3764e4c1b4b8e1988e272c1f diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c index fb659c844506..79a1e9dd56d9 100644 --- a/trunk/drivers/ata/ahci.c +++ b/trunk/drivers/ata/ahci.c @@ -103,8 +103,6 @@ static struct ata_port_operations ahci_p5wdh_ops = { .hardreset = ahci_p5wdh_hardreset, }; -#define AHCI_HFLAGS(flags) .private_data = (void *)(flags) - static const struct ata_port_info ahci_port_info[] = { /* by features */ [board_ahci] = diff --git a/trunk/drivers/ata/ahci.h b/trunk/drivers/ata/ahci.h index feb127ef4e4e..c2594ddf25b0 100644 --- a/trunk/drivers/ata/ahci.h +++ b/trunk/drivers/ata/ahci.h @@ -195,6 +195,9 @@ enum { PORT_FBS_EN = (1 << 0), /* Enable FBS */ /* hpriv->flags bits */ + +#define AHCI_HFLAGS(flags) .private_data = (void *)(flags) + AHCI_HFLAG_NO_NCQ = (1 << 0), AHCI_HFLAG_IGN_IRQ_IF_ERR = (1 << 1), /* ignore IRQ_IF_ERR */ AHCI_HFLAG_IGN_SERR_INTERNAL = (1 << 2), /* ignore SERR_INTERNAL */