13 files changed, 13 insertions, 26 deletions

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index b8d0b7825bf3..1c459ff037ce 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -25,7 +25,6 @@
 #undef  VERBOSE
 #undef  PACKET_TRACE
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -1654,13 +1653,13 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
         pullup(udc, 0);
 
         /* request UDC and maybe VBUS irqs */
-        if (request_irq(AT91_ID_UDP, at91_udc_irq, SA_INTERRUPT, driver_name, udc)) {
+        if (request_irq(AT91_ID_UDP, at91_udc_irq, IRQF_DISABLED, driver_name, udc)) {
                 DBG("request irq %d failed\n", AT91_ID_UDP);
                 retval = -EBUSY;
                 goto fail1;
         }
         if (udc->board.vbus_pin > 0) {
-                if (request_irq(udc->board.vbus_pin, at91_vbus_irq, SA_INTERRUPT, driver_name, udc)) {
+                if (request_irq(udc->board.vbus_pin, at91_vbus_irq, IRQF_DISABLED, driver_name, udc)) {
                         DBG("request vbus irq %d failed\n", udc->board.vbus_pin);
                         free_irq(AT91_ID_UDP, udc);
                         retval = -EBUSY;
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 42ce41d71b7f..4be47195bd38 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -36,7 +36,6 @@
 
 #define DEBUG
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 078daa026718..8320fcef0425 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -23,7 +23,6 @@
 // #define DEBUG 1
 // #define VERBOSE
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index a43dc908ac59..b1a9cf06f3e6 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -221,7 +221,6 @@
 #undef VERBOSE
 #undef DUMP_MSGS
 
-#include <linux/config.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 5378c1757292..7cf2999e8616 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -24,7 +24,6 @@
 // #define      VERBOSE         /* extra debug messages (success too) */
 // #define      USB_TRACE       /* packet-level success messages */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -1917,7 +1916,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         /* init to known state, then setup irqs */
         udc_reset(dev);
         udc_reinit (dev);
-        if (request_irq(pdev->irq, goku_irq, SA_SHIRQ/*|SA_SAMPLE_RANDOM*/,
+        if (request_irq(pdev->irq, goku_irq, IRQF_SHARED/*|IRQF_SAMPLE_RANDOM*/,
                         driver_name, dev) != 0) {
                 DBG(dev, "request interrupt %d failed\n", pdev->irq);
                 retval = -EBUSY;
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 0d3424eda038..bb22b7e82877 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -2107,7 +2107,7 @@ static int lh7a40x_udc_probe(struct platform_device *pdev)
 
         /* irq setup after old hardware state is cleaned up */
         retval =
-            request_irq(IRQ_USBINTR, lh7a40x_udc_irq, SA_INTERRUPT, driver_name,
+            request_irq(IRQ_USBINTR, lh7a40x_udc_irq, IRQF_DISABLED, driver_name,
                         dev);
         if (retval != 0) {
                 DEBUG(KERN_ERR "%s: can't get irq %i, err %d\n", driver_name,
diff --git a/drivers/usb/gadget/lh7a40x_udc.h b/drivers/usb/gadget/lh7a40x_udc.h
index 9b2e6f7cbb8b..e3bb78524c88 100644
--- a/drivers/usb/gadget/lh7a40x_udc.h
+++ b/drivers/usb/gadget/lh7a40x_udc.h
@@ -24,7 +24,6 @@
 #ifndef __LH7A40X_H_
 #define __LH7A40X_H_
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 1facdea56a8a..09243239d948 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -46,7 +46,6 @@
 #undef  DEBUG           /* messages on error and most fault paths */
 #undef  VERBOSE         /* extra debug messages (success too) */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -2896,7 +2895,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
                 goto done;
         }
 
-        if (request_irq (pdev->irq, net2280_irq, SA_SHIRQ, driver_name, dev)
+        if (request_irq (pdev->irq, net2280_irq, IRQF_SHARED, driver_name, dev)
                         != 0) {
                 ERROR (dev, "request interrupt %d failed\n", pdev->irq);
                 retval = -EBUSY;
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 36336486c883..2de9748ee673 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -22,7 +22,6 @@
 #undef  DEBUG
 #undef  VERBOSE
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
@@ -2819,7 +2818,7 @@ bad_on_1710:
 
         /* USB general purpose IRQ:  ep0, state changes, dma, etc */
         status = request_irq(pdev->resource[1].start, omap_udc_irq,
-                        SA_SAMPLE_RANDOM, driver_name, udc);
+                        IRQF_SAMPLE_RANDOM, driver_name, udc);
         if (status != 0) {
                 ERR( "can't get irq %ld, err %d\n",
                         pdev->resource[1].start, status);
@@ -2828,7 +2827,7 @@ bad_on_1710:
 
         /* USB "non-iso" IRQ (PIO for all but ep0) */
         status = request_irq(pdev->resource[2].start, omap_udc_pio_irq,
-                        SA_SAMPLE_RANDOM, "omap_udc pio", udc);
+                        IRQF_SAMPLE_RANDOM, "omap_udc pio", udc);
         if (status != 0) {
                 ERR( "can't get irq %ld, err %d\n",
                         pdev->resource[2].start, status);
@@ -2836,7 +2835,7 @@ bad_on_1710:
         }
 #ifdef  USE_ISO
         status = request_irq(pdev->resource[3].start, omap_udc_iso_irq,
-                        SA_INTERRUPT, "omap_udc iso", udc);
+                        IRQF_DISABLED, "omap_udc iso", udc);
         if (status != 0) {
                 ERR("can't get irq %ld, err %d\n",
                         pdev->resource[3].start, status);
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 269ce7f4ad66..fff027d30a09 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -27,7 +27,6 @@
 #undef  DEBUG
 // #define      VERBOSE DBG_VERBOSE
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
@@ -60,7 +59,7 @@
 #include <linux/usb_ch9.h>
 #include <linux/usb_gadget.h>
 
-#include <asm/arch/hardware/intel_udc.h>
+#include <asm/arch/udc.h>
 
 
 /*
@@ -2522,7 +2521,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
 
         /* irq setup after old hardware state is cleaned up */
         retval = request_irq(IRQ_USB, pxa2xx_udc_irq,
-                        SA_INTERRUPT, driver_name, dev);
+                        IRQF_DISABLED, driver_name, dev);
         if (retval != 0) {
                 printk(KERN_ERR "%s: can't get irq %i, err %d\n",
                         driver_name, IRQ_USB, retval);
@@ -2534,7 +2533,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
         if (machine_is_lubbock()) {
                 retval = request_irq(LUBBOCK_USB_DISC_IRQ,
                                 lubbock_vbus_irq,
-                                SA_INTERRUPT | SA_SAMPLE_RANDOM,
+                                IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
                                 driver_name, dev);
                 if (retval != 0) {
                         printk(KERN_ERR "%s: can't get irq %i, err %d\n",
@@ -2545,7 +2544,7 @@ lubbock_fail0:
                 }
                 retval = request_irq(LUBBOCK_USB_IRQ,
                                 lubbock_vbus_irq,
-                                SA_INTERRUPT | SA_SAMPLE_RANDOM,
+                                IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
                                 driver_name, dev);
                 if (retval != 0) {
                         printk(KERN_ERR "%s: can't get irq %i, err %d\n",
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 3ff6db7828a0..354670d12308 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -23,7 +23,6 @@
  *              updates to merge with Linux 2.6, better match RNDIS spec
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 9d6e1d295528..30d7664d449d 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -17,7 +17,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
@@ -588,12 +587,11 @@ static int __init gs_module_init(void)
         gs_tty_driver->owner = THIS_MODULE;
         gs_tty_driver->driver_name = GS_SHORT_NAME;
         gs_tty_driver->name = "ttygs";
-        gs_tty_driver->devfs_name = "usb/ttygs/";
         gs_tty_driver->major = GS_MAJOR;
         gs_tty_driver->minor_start = GS_MINOR_START;
         gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
         gs_tty_driver->subtype = SERIAL_TYPE_NORMAL;
-        gs_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
+        gs_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         gs_tty_driver->init_termios = tty_std_termios;
         gs_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
         tty_set_operations(gs_tty_driver, &gs_tty_ops);
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 68e3d8f5da89..3a08a7ab4ce0 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -62,7 +62,6 @@
 #define DEBUG 1
 // #define VERBOSE
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>