diff --git a/[refs] b/[refs] index 4bfa518e821b..67c9e65706c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 916c775ff297dc60219a4f0e5527ba6ab4a88ed4 +refs/heads/master: 6dc7d8c843024c2636cf52d3f93047acbcd765f2 diff --git a/trunk/drivers/net/bnx2x.h b/trunk/drivers/net/bnx2x.h index 15a5cf0f676b..3cf2b92eef3b 100644 --- a/trunk/drivers/net/bnx2x.h +++ b/trunk/drivers/net/bnx2x.h @@ -152,7 +152,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) #define BCM_RX_ETH_PAYLOAD_ALIGN 64