kernel: disable bridge igmp snooping in 3.2 as well

[openwrt.git] / target / linux / omap24xx / patches-3.1 / 850-musb-tusb-modular-fixes.patch

diff --git a/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch b/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch
index 3c7b462..afdea78 100644 (file)
--- a/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch
+++ b/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch
@@ -1,19 +1,5 @@
-Index: linux-3.1-rc4/drivers/Makefile
-===================================================================
---- linux-3.1-rc4.orig/drivers/Makefile        2011-10-30 00:12:03.959808922 +0200
-+++ linux-3.1-rc4/drivers/Makefile     2011-10-30 00:12:06.543770526 +0200
-@@ -71,6 +71,7 @@ obj-$(CONFIG_USB_OTG_UTILS)  += usb/
- obj-$(CONFIG_USB)             += usb/
- obj-$(CONFIG_PCI)             += usb/
- obj-$(CONFIG_USB_GADGET)      += usb/
-+obj-y                         += usb/
- obj-$(CONFIG_SERIO)           += input/serio/
- obj-$(CONFIG_GAMEPORT)                += input/gameport/
- obj-$(CONFIG_INPUT)           += input/
-Index: linux-3.1-rc4/drivers/usb/musb/tusb6010.c
-===================================================================
---- linux-3.1-rc4.orig/drivers/usb/musb/tusb6010.c     2011-10-30 00:12:03.951809040 +0200
-+++ linux-3.1-rc4/drivers/usb/musb/tusb6010.c  2011-10-30 00:12:06.543770526 +0200
+--- a/drivers/usb/musb/tusb6010.c
++++ b/drivers/usb/musb/tusb6010.c
 @@ -56,6 +56,7 @@ u8 tusb_get_revision(struct musb *musb)
  
        return rev;
@@ -64,10 +50,8 @@ Index: linux-3.1-rc4/drivers/usb/musb/tusb6010.c
  }
 -module_exit(tusb_exit);
 +EXPORT_SYMBOL(musb_hdrc_glue_exit);
-Index: linux-3.1-rc4/drivers/usb/musb/musb_core.c
-===================================================================
---- linux-3.1-rc4.orig/drivers/usb/musb/musb_core.c    2011-10-30 00:12:03.943809160 +0200
-+++ linux-3.1-rc4/drivers/usb/musb/musb_core.c 2011-10-30 00:20:44.156218000 +0200
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
 @@ -207,7 +207,7 @@ static struct otg_io_access_ops musb_ulp
  
  /*-------------------------------------------------------------------------*/
@@ -95,7 +79,7 @@ Index: linux-3.1-rc4/drivers/usb/musb/musb_core.c
                hw_ep->fifo_async = musb->async + 0x400 + MUSB_FIFO_OFFSET(i);
                hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i);
                hw_ep->fifo_sync_va =
-@@ -2376,8 +2376,13 @@ static struct platform_driver musb_drive
+@@ -2368,8 +2368,13 @@ static struct platform_driver musb_drive
  
  /*-------------------------------------------------------------------------*/
  
@@ -109,7 +93,7 @@ Index: linux-3.1-rc4/drivers/usb/musb/musb_core.c
        if (usb_disabled())
                return 0;
  
-@@ -2386,7 +2391,17 @@ static int __init musb_init(void)
+@@ -2378,7 +2383,17 @@ static int __init musb_init(void)
                ", "
                "otg (peripheral+host)",
                musb_driver_name);
@@ -128,17 +112,15 @@ Index: linux-3.1-rc4/drivers/usb/musb/musb_core.c
  }
  
  /* make us init after usbcore and i2c (transceivers, regulators, etc)
-@@ -2397,5 +2412,6 @@ fs_initcall(musb_init);
+@@ -2389,5 +2404,6 @@ fs_initcall(musb_init);
  static void __exit musb_cleanup(void)
  {
        platform_driver_unregister(&musb_driver);
 +      musb_hdrc_glue_exit();
  }
  module_exit(musb_cleanup);
-Index: linux-3.1-rc4/drivers/usb/Makefile
-===================================================================
---- linux-3.1-rc4.orig/drivers/usb/Makefile    2011-10-30 00:12:03.939809220 +0200
-+++ linux-3.1-rc4/drivers/usb/Makefile 2011-10-30 00:12:06.543770526 +0200
+--- a/drivers/usb/Makefile
++++ b/drivers/usb/Makefile
 @@ -47,7 +47,7 @@ obj-$(CONFIG_EARLY_PRINTK_DBGP)      += early
  obj-$(CONFIG_USB_ATM)         += atm/
  obj-$(CONFIG_USB_SPEEDTOUCH)  += atm/
@@ -148,10 +130,8 @@ Index: linux-3.1-rc4/drivers/usb/Makefile
  obj-$(CONFIG_USB_RENESAS_USBHS)       += renesas_usbhs/
  obj-$(CONFIG_USB_OTG_UTILS)   += otg/
  obj-$(CONFIG_USB_GADGET)      += gadget/
-Index: linux-3.1-rc4/drivers/usb/musb/Makefile
-===================================================================
---- linux-3.1-rc4.orig/drivers/usb/musb/Makefile       2011-10-30 00:11:34.852241963 +0200
-+++ linux-3.1-rc4/drivers/usb/musb/Makefile    2011-10-30 00:14:52.945312862 +0200
+--- a/drivers/usb/musb/Makefile
++++ b/drivers/usb/musb/Makefile
 @@ -13,7 +13,7 @@ musb_hdrc-$(CONFIG_DEBUG_FS)                 += musb_d
  # Hardware Glue Layer
  obj-$(CONFIG_USB_MUSB_OMAP2PLUS)              += omap2430.o