---

yaml --- r: 303980 b: refs/heads/master c: da020b4 h: refs/heads/master v: v3
git-mirror · May 17, 2012 · 24e2bcf · 24e2bcf
1 parent e9213a7
commit 24e2bcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 123bbceebeb1174e385eab1fc2b2535dcdcc9ec3
+refs/heads/master: da020b49fa6ee7eaf9fe359bc6089dd1848bb7d0
diff --git a/trunk/drivers/usb/otg/gpio_vbus.c b/trunk/drivers/usb/otg/gpio_vbus.c
@@ -53,8 +53,7 @@ struct gpio_vbus_data {
  * edges might be workable.
  */
 #define VBUS_IRQ_FLAGS \
-	( IRQF_SAMPLE_RANDOM | IRQF_SHARED \
-	| IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING )
+	(IRQF_SHARED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)
 
 
 /* interface to regulator framework */
@@ -280,7 +279,7 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
 	if (res) {
 		irq = res->start;
 		res->flags &= IRQF_TRIGGER_MASK;
-		res->flags |= IRQF_SAMPLE_RANDOM | IRQF_SHARED;
+		res->flags |= IRQF_SHARED;
 	} else
 		irq = gpio_to_irq(gpio);