---

yaml --- r: 235627 b: refs/heads/master c: 7bb5e82 h: refs/heads/master i: 235625: a40df19 235623: cb982b1 v: v3
git-mirror · Jan 21, 2011 · 880f3e4 · 880f3e4
1 parent 7050933
commit 880f3e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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{