linux-next: manual merge of the staging tree with the net tree

Stephen Rothwell
2011-07-07T05:44:23Z

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8192e/r8192E.h between commit 219eb47e6f35
("net/staging: add needed interrupt.h and hardirq.h includes") from the
net tree and commit 41134db17a7d ("Remove unneeded version.h includes
from drivers/staging/rtl*/") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/rtl8192e/r8192E.h
index 89fe8fc,0faa637..0000000
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@@ -35,8 -35,6 +35,7 @@@
#include <linux/proc_fs.h> // Necessary because we use the proc fs
#include <linux/if_arp.h>
#include <linux/random.h>
- #include <linux/version.h>
+#include <linux/interrupt.h>
#include <asm/io.h>
#include "ieee80211/rtl819x_HT.h"
#include "ieee80211/ieee80211.h"