From 9b96e0208daa7a79a6a827d252146d12e87048ea Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Sun, 11 Jan 2009 17:22:36 +0800
Subject: [PATCH] --- yaml --- r: 141231 b: refs/heads/master c:
 4ed4f41c1b13873f4b8afd4fbe00eb8c3907bc4a h: refs/heads/master i:   141229:
 291a635a3eea22654b8c923acb728e70c6bd6d99   141227:
 a70a440b9832667de0edba54898b1eda8df43b3c   141223:
 b355fb2d68df01de31f66e74bd6cb0786e662483   141215:
 3c1a5fe3aadcdf7e457fbbce57bbd579190879b6 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/altpciechdma/altpciechdma.c | 1 -
 trunk/drivers/staging/comedi/comedidev.h          | 1 -
 trunk/drivers/staging/rt2860/rt_linux.h           | 1 -
 trunk/drivers/staging/rt2870/rt_linux.h           | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 53225badffb4..4bedb8a04d09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93be73f92980fab947b9565695ffe26a4b7bbf29
+refs/heads/master: 4ed4f41c1b13873f4b8afd4fbe00eb8c3907bc4a
diff --git a/trunk/drivers/staging/altpciechdma/altpciechdma.c b/trunk/drivers/staging/altpciechdma/altpciechdma.c
index f516140ca976..3e04a6227826 100644
--- a/trunk/drivers/staging/altpciechdma/altpciechdma.c
+++ b/trunk/drivers/staging/altpciechdma/altpciechdma.c
@@ -46,7 +46,6 @@
 #include <linux/cdev.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
-#include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index 3735355d3c58..4679911171de 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/drivers/staging/comedi/comedidev.h
@@ -36,7 +36,6 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/vmalloc.h>
-#include <linux/mm.h>
 #include "interrupt.h"
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
diff --git a/trunk/drivers/staging/rt2860/rt_linux.h b/trunk/drivers/staging/rt2860/rt_linux.h
index 0fd58f5109f2..f1686917e832 100644
--- a/trunk/drivers/staging/rt2860/rt_linux.h
+++ b/trunk/drivers/staging/rt2860/rt_linux.h
@@ -65,7 +65,6 @@
 #include <linux/vmalloc.h>
 
 
-#include <linux/wireless.h>
 #include <net/iw_handler.h>
 
 // load firmware
diff --git a/trunk/drivers/staging/rt2870/rt_linux.h b/trunk/drivers/staging/rt2870/rt_linux.h
index 859f9cef0a19..49ad37f00637 100644
--- a/trunk/drivers/staging/rt2870/rt_linux.h
+++ b/trunk/drivers/staging/rt2870/rt_linux.h
@@ -65,7 +65,6 @@
 #include <linux/vmalloc.h>
 
 
-#include <linux/wireless.h>
 #include <net/iw_handler.h>
 
 // load firmware