Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts:
	arch/x86/oprofile/nmi_int.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c
index 889f98724610..a85efcfd9d0e 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/skfp/ess.c
@@ -510,7 +510,7 @@ static void ess_send_response(struct s_smc *smc, struct smt_header *sm,
         chg->path.para.p_type = SMT_P320B ;
         chg->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ;
         chg->path.mib_index = SBAPATHINDEX ;
-        chg->path.path_pad = (u_short)NULL ;
+        chg->path.path_pad = 0;
         chg->path.path_index = PRIMARY_RING ;
 
         /* set P320F */
@@ -606,7 +606,7 @@ static void ess_send_alc_req(struct s_smc *smc)
         req->path.para.p_type = SMT_P320B ;
         req->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ;
         req->path.mib_index = SBAPATHINDEX ;
-        req->path.path_pad = (u_short)NULL ;
+        req->path.path_pad = 0;
         req->path.path_index = PRIMARY_RING ;
 
         /* set P0017 */
@@ -636,7 +636,7 @@ static void ess_send_alc_req(struct s_smc *smc)
         /* set P19 */
         req->a_addr.para.p_type = SMT_P0019 ;
         req->a_addr.para.p_len = sizeof(struct smt_p_0019) - PARA_LEN ;
-        req->a_addr.sba_pad = (u_short)NULL ;
+        req->a_addr.sba_pad = 0;
         req->a_addr.alloc_addr = null_addr ;
 
         /* set P1A */