diff options
| author | Matei Pavaluca <matei.pavaluca@freescale.com> | 2014-11-19 11:09:04 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:41:10 (GMT) |
| commit | 61ec5fc8280db03058dfd9f641c4748b9f658715 (patch) | |
| tree | 7a0889bd06673b8b1d667e4a92781999230863d1 /drivers/net/ethernet/freescale/gianfar.h | |
| parent | 618cef17a3ebd69fca806ca0fb017276136a509b (diff) | |
| download | linux-fsl-qoriq-61ec5fc8280db03058dfd9f641c4748b9f658715.tar.xz | |
gianfar: Fix compile error for FSL_GIANFAR_1588
| drivers/net/ethernet/freescale/gianfar.c: In function 'gfar_init_bds':
| drivers/net/ethernet/freescale/gianfar.c:227:16: error: 'struct gfar'
has no member named 'rfbptr0'
| rfbptr = ®s->rfbptr0;
| ^
| drivers/net/ethernet/freescale/gianfar.c: In function 'gfar_init_rqprm':
| drivers/net/ethernet/freescale/gianfar.c:385:15: error: 'struct gfar'
has no member named 'rqprm0'
| baddr = ®s->rqprm0;
| ^
Signed-off-by: Matei Pavaluca <matei.pavaluca@freescale.com>
Change-Id: I90b995bdf88d5e6779c3eb2b13cefb37b603bdc7
Reviewed-on: http://git.am.freescale.net:8181/23975
Reviewed-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Reviewed-by: Yangbo Lu <yangbo.lu@freescale.com>
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar.h')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h index 802bef4..6914f31 100644 --- a/drivers/net/ethernet/freescale/gianfar.h +++ b/drivers/net/ethernet/freescale/gianfar.h @@ -1048,10 +1048,6 @@ struct gfar { u8 res23c[248]; u32 attr; /* 0x.bf8 - Attributes Register */ u32 attreli; /* 0x.bfc - Attributes Extract Length and Extract Index Register */ -#if defined CONFIG_FSL_GIANFAR_1588 - u8 res24[512]; - struct gfar_regs_1588 regs_1588; -#else u32 rqprm0; /* 0x.c00 - Receive queue parameters register 0 */ u32 rqprm1; /* 0x.c04 - Receive queue parameters register 1 */ u32 rqprm2; /* 0x.c08 - Receive queue parameters register 2 */ @@ -1077,9 +1073,13 @@ struct gfar { u8 res24g[4]; u32 rfbptr7; /* 0x.c7c - Last free RxBD pointer for ring 7 */ u8 res24h[4]; +#if defined CONFIG_FSL_GIANFAR_1588 + u8 res24x[380]; + struct gfar_regs_1588 regs_1588; +#else u8 res24x[556]; - #endif + u32 isrg0; /* 0x.eb0 - Interrupt steering group 0 register */ u32 isrg1; /* 0x.eb4 - Interrupt steering group 1 register */ u32 isrg2; /* 0x.eb8 - Interrupt steering group 2 register */ |