From: Ali Bahar Date: Sat, 3 Sep 2011 19:14:13 +0000 (+0800) Subject: staging: r8712u: Merging Realtek's latest (v2.6.6). No power tracking OID. X-Git-Tag: v3.2-rc1~169^2^2~604 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac9bfc14ad3123f636dee049a5a64b94def2a273;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git staging: r8712u: Merging Realtek's latest (v2.6.6). No power tracking OID. The call to oid_rt_pro_set_power_tracking_hdl() is no longer available. The function's definition remains, though it is currently unused. Signed-off-by: Ali Bahar Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h index 1c38a11..850143d 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h +++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h @@ -434,8 +434,7 @@ static struct mp_ioctl_handler mp_ioctl_hdl[] = { {sizeof(struct psmode_param), NULL, 0},/*13*/ {sizeof(struct eeprom_rw_param), NULL, 0},/*14*/ {sizeof(struct eeprom_rw_param), NULL, 0},/*15*/ - {sizeof(u8), oid_rt_pro_set_power_tracking_hdl, - OID_RT_PRO_SET_POWER_TRACKING},/*16*/ + {sizeof(unsigned char), NULL, 0},/*16*/ {sizeof(u32), NULL, 0},/*17*/ {sizeof(u32), oid_rt_pro_set_continuous_tx_hdl, OID_RT_PRO_SET_CONTINUOUS_TX},/*18*/