diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/net/cxgb3 | |
parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r-- | drivers/net/cxgb3/sge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index 78e265b484b..67e61b2a8c4 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c | |||
@@ -197,13 +197,13 @@ static inline void refill_rspq(struct adapter *adapter, | |||
197 | /** | 197 | /** |
198 | * need_skb_unmap - does the platform need unmapping of sk_buffs? | 198 | * need_skb_unmap - does the platform need unmapping of sk_buffs? |
199 | * | 199 | * |
200 | * Returns true if the platfrom needs sk_buff unmapping. The compiler | 200 | * Returns true if the platform needs sk_buff unmapping. The compiler |
201 | * optimizes away unecessary code if this returns true. | 201 | * optimizes away unecessary code if this returns true. |
202 | */ | 202 | */ |
203 | static inline int need_skb_unmap(void) | 203 | static inline int need_skb_unmap(void) |
204 | { | 204 | { |
205 | /* | 205 | /* |
206 | * This structure is used to tell if the platfrom needs buffer | 206 | * This structure is used to tell if the platform needs buffer |
207 | * unmapping by checking if DECLARE_PCI_UNMAP_ADDR defines anything. | 207 | * unmapping by checking if DECLARE_PCI_UNMAP_ADDR defines anything. |
208 | */ | 208 | */ |
209 | struct dummy { | 209 | struct dummy { |