From 9bc9ba21382a1d180cd7bc2be7dcb45aad0915fe Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 17 Jul 2012 14:00:26 -0400
Subject: [PATCH] --- yaml --- r: 320735 b: refs/heads/master c:
 8de1ee8f93fb756000176f916fd0681b47ceb292 h: refs/heads/master i:   320733:
 6c9f5d4ca853691dfbcf50b8eefeba97d001d871   320731:
 ffa6efbc3afd26c30b3a622d8e19cdd8904369c2   320727:
 fe2b11ab366575d1fe072d7822b056b0763aea84   320719:
 ef2a993029cd31e3ab41019d40a58a534a989119   320703:
 394a75249298f7791500dd25dc55e964956b3f5b v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/usb/gadget/pxa25x_udc.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ea860f224db3..47b1d85369e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9728276835f319e32e2571fb0fb18777237de87c
+refs/heads/master: 8de1ee8f93fb756000176f916fd0681b47ceb292
diff --git a/trunk/drivers/usb/gadget/pxa25x_udc.c b/trunk/drivers/usb/gadget/pxa25x_udc.c
index f7ff9e8e746a..c319814ad120 100644
--- a/trunk/drivers/usb/gadget/pxa25x_udc.c
+++ b/trunk/drivers/usb/gadget/pxa25x_udc.c
@@ -2200,19 +2200,15 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_ARCH_LUBBOCK
 	if (machine_is_lubbock()) {
-		retval = request_irq(LUBBOCK_USB_DISC_IRQ,
-				lubbock_vbus_irq,
-				IRQF_SAMPLE_RANDOM,
-				driver_name, dev);
+		retval = request_irq(LUBBOCK_USB_DISC_IRQ, lubbock_vbus_irq,
+				     0, driver_name, dev);
 		if (retval != 0) {
 			pr_err("%s: can't get irq %i, err %d\n",
 				driver_name, LUBBOCK_USB_DISC_IRQ, retval);
 			goto err_irq_lub;
 		}
-		retval = request_irq(LUBBOCK_USB_IRQ,
-				lubbock_vbus_irq,
-				IRQF_SAMPLE_RANDOM,
-				driver_name, dev);
+		retval = request_irq(LUBBOCK_USB_IRQ, lubbock_vbus_irq,
+				     0, driver_name, dev);
 		if (retval != 0) {
 			pr_err("%s: can't get irq %i, err %d\n",
 				driver_name, LUBBOCK_USB_IRQ, retval);