aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/typhoon.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-09-27 19:57:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-27 19:57:54 +0100
commit2dc94310bd94d0906febea7d0f7c188da620c952 (patch)
tree6de4096f1887e2c00966177354b1c378e59bd632 /drivers/net/typhoon.h
parentc06015148fa9a3cc452ec7121b8c3f59f4a7d6ac (diff)
parentfb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
Diffstat (limited to 'drivers/net/typhoon.h')
-rw-r--r--drivers/net/typhoon.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/typhoon.h b/drivers/net/typhoon.h
index 738ee71d8df..2f14a050051 100644
--- a/drivers/net/typhoon.h
+++ b/drivers/net/typhoon.h
@@ -46,7 +46,7 @@ struct transmit_ring {
/* The host<->Typhoon ring index structure
* This indicates the current positions in the rings
- *
+ *
* All values must be in little endian format for the 3XP
*
* rxHiCleared: entry we've cleared to in the Hi receive ring
@@ -131,7 +131,7 @@ struct typhoon_interface {
*
* A packet is described by a packet descriptor, followed by option descriptors,
* if any, then one or more fragment descriptors.
- *
+ *
* Packet descriptor:
* flags: Descriptor type
* len:i zero, or length of this packet