From 3460eeef531c6468cc05c2be8793409de8cb7f6c Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 28 Nov 2010 23:00:06 +0200
Subject: [PATCH] --- yaml --- r: 228236 b: refs/heads/master c:
 4398954e5f91e340f5a2db53d219b6562e3e1bf0 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/winbond/mds.c       |  1 -
 trunk/drivers/staging/winbond/wblinux_f.h | 17 -----------------
 trunk/drivers/staging/winbond/wbusb.c     |  1 -
 4 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 trunk/drivers/staging/winbond/wblinux_f.h

diff --git a/[refs] b/[refs]
index 6b7ff732c123..90f68df35442 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01b5ceeca5aa45735a987420c83228a9778a791f
+refs/heads/master: 4398954e5f91e340f5a2db53d219b6562e3e1bf0
diff --git a/trunk/drivers/staging/winbond/mds.c b/trunk/drivers/staging/winbond/mds.c
index 00e9756da9c1..9cfea94bcea5 100644
--- a/trunk/drivers/staging/winbond/mds.c
+++ b/trunk/drivers/staging/winbond/mds.c
@@ -1,7 +1,6 @@
 #include "mds_f.h"
 #include "mto.h"
 #include "wbhal.h"
-#include "wblinux_f.h"
 #include "wb35tx_f.h"
 
 unsigned char
diff --git a/trunk/drivers/staging/winbond/wblinux_f.h b/trunk/drivers/staging/winbond/wblinux_f.h
deleted file mode 100644
index 0a9d214f7187..000000000000
--- a/trunk/drivers/staging/winbond/wblinux_f.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __WBLINUX_F_H
-#define __WBLINUX_F_H
-
-#include "core.h"
-#include "mds_s.h"
-
-/*
- * ====================================================================
- * Copyright (c) 1996-2004 Winbond Electronic Corporation
- *
- * wblinux_f.h
- * ====================================================================
- */
-int wb35_start_xmit(struct sk_buff *skb, struct net_device *netdev);
-void wb35_set_multicast(struct net_device *netdev);
-struct net_device_stats *wb35_netdev_stats(struct net_device *netdev);
-#endif
diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c
index c5a3107bd4a7..4f959c203857 100644
--- a/trunk/drivers/staging/winbond/wbusb.c
+++ b/trunk/drivers/staging/winbond/wbusb.c
@@ -19,7 +19,6 @@
 #include "wb35reg_f.h"
 #include "wb35tx_f.h"
 #include "wb35rx_f.h"
-#include "wblinux_f.h"
 
 MODULE_DESCRIPTION("IS89C35 802.11bg WLAN USB Driver");
 MODULE_LICENSE("GPL");