From 07de6f5d7f2c972c51df207f87c586a227d3f820 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 14 Jan 2011 14:54:13 -0600
Subject: [PATCH] --- yaml --- r: 235664 b: refs/heads/master c:
 e3dc896b21fbb4d23e2747dbe58bb9156c9e1a99 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 1 +
 trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.c    | 2 --
 trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.h    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cc8a653237a2..1b83f83a9abb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ddc5fb43e47e18d434619e08d41260ff121a7f6
+refs/heads/master: e3dc896b21fbb4d23e2747dbe58bb9156c9e1a99
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 685a7b112d4b..0d288c159c1d 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -27,6 +27,7 @@
  ******************************************************************************/
 
 #define _RTL871X_IOCTL_LINUX_C_
+#define _RTL871X_MP_IOCTL_C_
 
 #include "osdep_service.h"
 #include "drv_types.h"
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.c b/trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index d60aaa9c4872..5eb461b4a491 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -26,8 +26,6 @@
  *
  ******************************************************************************/
 
-#define _RTL871X_MP_IOCTL_C_
-
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "mlme_osdep.h"
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.h b/trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
index 2225bd15466b..fdd2278936d8 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
+++ b/trunk/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
@@ -373,7 +373,7 @@ unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv);
 #ifdef _RTL871X_MP_IOCTL_C_ /* CAUTION!!! */
 /* This ifdef _MUST_ be left in!! */
 
-struct mp_ioctl_handler mp_ioctl_hdl[] = {
+static struct mp_ioctl_handler mp_ioctl_hdl[] = {
 	{sizeof(u32), oid_rt_pro_start_test_hdl,
 			     OID_RT_PRO_START_TEST},/*0*/
 	{sizeof(u32), oid_rt_pro_stop_test_hdl,