From 880f3e4d6e60f0473e1f7f41735785b4a0ecfcac Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem@ring3k.org>
Date: Mon, 27 Dec 2010 21:51:09 +0900
Subject: [PATCH] --- yaml --- r: 235627 b: refs/heads/master c:
 7bb5e8232b8d37cb1e2b5f80dff50b1a505c1066 h: refs/heads/master i:   235625:
 a40df1933e6e1ad25cb6a91562da2ba97ccd08a7   235623:
 cb982b1a3505f566081fd741f5ef5186b9f7d1e4 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/rtl8192e/r8192E_core.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e1702ff98624..c6255a6997df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9c0afc98b335a3358d57021243add3bc0495559
+refs/heads/master: 7bb5e8232b8d37cb1e2b5f80dff50b1a505c1066
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c
index cc391ee2bf22..541d83d279e3 100644
--- a/trunk/drivers/staging/rtl8192e/r8192E_core.c
+++ b/trunk/drivers/staging/rtl8192e/r8192E_core.c
@@ -2913,11 +2913,7 @@ static short rtl8192_init(struct net_device *dev)
 	init_timer(&priv->watch_dog_timer);
 	priv->watch_dog_timer.data = (unsigned long)dev;
 	priv->watch_dog_timer.function = watch_dog_timer_callback;
-#if defined(IRQF_SHARED)
-        if(request_irq(dev->irq, (void*)rtl8192_interrupt, IRQF_SHARED, dev->name, dev)){
-#else
-        if(request_irq(dev->irq, (void *)rtl8192_interrupt, SA_SHIRQ, dev->name, dev)){
-#endif
+        if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED, dev->name, dev)) {
 		printk("Error allocating IRQ %d",dev->irq);
 		return -1;
 	}else{