diff options
author | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /drivers/net/gianfar.h | |
parent | 4aa3a715551c93eda32d79bd52042ce500bd5383 (diff) | |
parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'drivers/net/gianfar.h')
-rw-r--r-- | drivers/net/gianfar.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index a4e690a9aeb9..76f14d044470 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * Maintainer: Kumar Gala | 9 | * Maintainer: Kumar Gala |
10 | * Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com> | 10 | * Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com> |
11 | * | 11 | * |
12 | * Copyright 2002-2009 Freescale Semiconductor, Inc. | 12 | * Copyright 2002-2009, 2011 Freescale Semiconductor, Inc. |
13 | * | 13 | * |
14 | * This program is free software; you can redistribute it and/or modify it | 14 | * This program is free software; you can redistribute it and/or modify it |
15 | * under the terms of the GNU General Public License as published by the | 15 | * under the terms of the GNU General Public License as published by the |
@@ -1122,10 +1122,12 @@ struct gfar_private { | |||
1122 | /* HW time stamping enabled flag */ | 1122 | /* HW time stamping enabled flag */ |
1123 | int hwts_rx_en; | 1123 | int hwts_rx_en; |
1124 | int hwts_tx_en; | 1124 | int hwts_tx_en; |
1125 | |||
1126 | /*Filer table*/ | ||
1127 | unsigned int ftp_rqfpr[MAX_FILER_IDX + 1]; | ||
1128 | unsigned int ftp_rqfcr[MAX_FILER_IDX + 1]; | ||
1125 | }; | 1129 | }; |
1126 | 1130 | ||
1127 | extern unsigned int ftp_rqfpr[MAX_FILER_IDX + 1]; | ||
1128 | extern unsigned int ftp_rqfcr[MAX_FILER_IDX + 1]; | ||
1129 | 1131 | ||
1130 | static inline int gfar_has_errata(struct gfar_private *priv, | 1132 | static inline int gfar_has_errata(struct gfar_private *priv, |
1131 | enum gfar_errata err) | 1133 | enum gfar_errata err) |