aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/stmmac/gmac.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:43:33 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:43:33 -0500
commit4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch)
tree856ba96302a36014736747e8464f80eeb827bbdd /drivers/net/stmmac/gmac.h
parentf6c4c8195b5e7878823caa1181be404d9e86d369 (diff)
parentd014d043869cdc591f3a33243d3481fa4479c2d0 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
Diffstat (limited to 'drivers/net/stmmac/gmac.h')
-rw-r--r--drivers/net/stmmac/gmac.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/stmmac/gmac.h b/drivers/net/stmmac/gmac.h
index 684a363120a9..2e82d6c9a148 100644
--- a/drivers/net/stmmac/gmac.h
+++ b/drivers/net/stmmac/gmac.h
@@ -154,14 +154,14 @@ enum rx_tx_priority_ratio {
154#define DMA_CONTROL_DT 0x04000000 /* Disable Drop TCP/IP csum error */ 154#define DMA_CONTROL_DT 0x04000000 /* Disable Drop TCP/IP csum error */
155#define DMA_CONTROL_RSF 0x02000000 /* Receive Store and Forward */ 155#define DMA_CONTROL_RSF 0x02000000 /* Receive Store and Forward */
156#define DMA_CONTROL_DFF 0x01000000 /* Disaable flushing */ 156#define DMA_CONTROL_DFF 0x01000000 /* Disaable flushing */
157/* Theshold for Activating the FC */ 157/* Threshold for Activating the FC */
158enum rfa { 158enum rfa {
159 act_full_minus_1 = 0x00800000, 159 act_full_minus_1 = 0x00800000,
160 act_full_minus_2 = 0x00800200, 160 act_full_minus_2 = 0x00800200,
161 act_full_minus_3 = 0x00800400, 161 act_full_minus_3 = 0x00800400,
162 act_full_minus_4 = 0x00800600, 162 act_full_minus_4 = 0x00800600,
163}; 163};
164/* Theshold for Deactivating the FC */ 164/* Threshold for Deactivating the FC */
165enum rfd { 165enum rfd {
166 deac_full_minus_1 = 0x00400000, 166 deac_full_minus_1 = 0x00400000,
167 deac_full_minus_2 = 0x00400800, 167 deac_full_minus_2 = 0x00400800,