summaryrefslogtreecommitdiff
path: root/drivers/net/bnx2x.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-10 15:04:16 +0300
committerDavid S. Miller <davem@davemloft.net>2009-03-10 15:04:16 +0300
commitd5df2a16133f4eb22f9a6bbc07723443568d362f (patch)
tree7135c9054db234feec6001c6d938a715b29e2370 /drivers/net/bnx2x.h
parentd4a4aba61731ce6d102a6a93e22b8fa26511c9d5 (diff)
parentdb434ac6bff0d991d0b60166dc9d6405b873d0f7 (diff)
downloadlinux-d5df2a16133f4eb22f9a6bbc07723443568d362f.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x_main.c drivers/net/wireless/iwlwifi/iwl3945-base.c drivers/net/wireless/rt2x00/rt73usb.c
Diffstat (limited to 'drivers/net/bnx2x.h')
-rw-r--r--drivers/net/bnx2x.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 408eae7d6cc6..a329bee25550 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -160,7 +160,7 @@ struct sw_rx_page {
#define PAGES_PER_SGE (1 << PAGES_PER_SGE_SHIFT)
#define SGE_PAGE_SIZE PAGE_SIZE
#define SGE_PAGE_SHIFT PAGE_SHIFT
-#define SGE_PAGE_ALIGN(addr) PAGE_ALIGN(addr)
+#define SGE_PAGE_ALIGN(addr) PAGE_ALIGN((typeof(PAGE_SIZE))addr)
/* SGE ring related macros */
#define NUM_RX_SGE_PAGES 2