From 0ca49d956cee9372e67c1d0e9c0690605496f079 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 19 Sep 2010 12:28:39 +0300
Subject: [PATCH] --- yaml --- r: 219940 b: refs/heads/master c:
 b9f98a05ba18cadd95fe57502ba038bb83001477 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/winbond/mds_s.h  |  1 -
 trunk/drivers/staging/winbond/scan_s.h | 57 --------------------------
 3 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 trunk/drivers/staging/winbond/scan_s.h

diff --git a/[refs] b/[refs]
index 5e4601cd0145..522c8d8db444 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4d562a99fdf6ef66ee974f54efea66d09d504cf
+refs/heads/master: b9f98a05ba18cadd95fe57502ba038bb83001477
diff --git a/trunk/drivers/staging/winbond/mds_s.h b/trunk/drivers/staging/winbond/mds_s.h
index 89328c5dbdad..e2de4bd23b4d 100644
--- a/trunk/drivers/staging/winbond/mds_s.h
+++ b/trunk/drivers/staging/winbond/mds_s.h
@@ -7,7 +7,6 @@
 
 #include "localpara.h"
 #include "mac_structures.h"
-#include "scan_s.h"
 
 /* Preamble_Type, see <SFS-802.11G-MIB-203> */
 enum {
diff --git a/trunk/drivers/staging/winbond/scan_s.h b/trunk/drivers/staging/winbond/scan_s.h
deleted file mode 100644
index 85cdf3bc8e65..000000000000
--- a/trunk/drivers/staging/winbond/scan_s.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef __WINBOND_SCAN_S_H
-#define __WINBOND_SCAN_S_H
-
-#include <linux/types.h>
-#include "localpara.h"
-
-/*
- * SCAN task global CONSTANTS, STRUCTURES, variables
- */
-
-/* define the msg type of SCAN module */
-#define SCANMSG_SCAN_REQ		0x01
-#define SCANMSG_BEACON			0x02
-#define SCANMSG_PROBE_RESPONSE		0x03
-#define SCANMSG_TIMEOUT			0x04
-#define SCANMSG_TXPROBE_FAIL		0x05
-#define SCANMSG_ENABLE_BGSCAN		0x06
-#define SCANMSG_STOP_SCAN		0x07
-
-/*
- * BSS Type =>conform to
- * IBSS             : ToDS/FromDS = 00
- * Infrastructure   : ToDS/FromDS = 01
- */
-#define IBSS_NET			0
-#define ESS_NET				1
-#define ANYBSS_NET			2
-
-/* Scan Type */
-#define ACTIVE_SCAN			0
-#define PASSIVE_SCAN			1
-
-/*
- * ===========================================================
- *	scan.h
- *		Define the related definitions of scan module
- *
- * ===========================================================
- */
-
-/* Define the state of scan module */
-#define SCAN_INACTIVE			0
-#define WAIT_PROBE_DELAY		1
-#define WAIT_RESPONSE_MIN		2
-#define WAIT_RESPONSE_MAX_ACTIVE	3
-#define WAIT_BEACON_MAX_PASSIVE		4
-#define SCAN_COMPLETE			5
-#define BG_SCAN				6
-#define BG_SCANNING			7
-
-
-/*
- * The value will load from EEPROM
- * If 0xff is set in EEPOM, the driver will use SCAN_MAX_CHNL_TIME instead.
- * The definition is in WbHal.h
- */
-#endif