linux/3.3: refresh patches against 3.3-rc5

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30799 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
index 5eda87c..1a64389 100644 (file)
--- a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
+++ b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
@@ -244,7 +244,7 @@
  ========================
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
  ========================
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -4924,6 +4924,13 @@ F:      drivers/scsi/osd/
+@@ -4928,6 +4928,13 @@ F:      drivers/scsi/osd/

  F:    include/scsi/osd_*
  F:    fs/exofs/
  
  F:    include/scsi/osd_*
  F:    fs/exofs/
  

diff --git a/target/linux/generic/patches-3.3/202-reduce_module_size.patch b/target/linux/generic/patches-3.3/202-reduce_module_size.patch
index 58b4a75..f1efb90 100644 (file)
--- a/target/linux/generic/patches-3.3/202-reduce_module_size.patch
+++ b/target/linux/generic/patches-3.3/202-reduce_module_size.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
 --- a/Makefile
 +++ b/Makefile

-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ KBUILD_CFLAGS_KERNEL :=

  KBUILD_AFLAGS   := -D__ASSEMBLY__
  KBUILD_AFLAGS_MODULE  := -DMODULE
  KBUILD_CFLAGS_MODULE  := -DMODULE
  KBUILD_AFLAGS   := -D__ASSEMBLY__
  KBUILD_AFLAGS_MODULE  := -DMODULE
  KBUILD_CFLAGS_MODULE  := -DMODULE

diff --git a/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
index c0a478b..4a7d351 100644 (file)
--- a/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch
@@ -10,8 +10,8 @@
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
        u16 cmd;
  static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
  {
        u16 cmd;

-@@ -877,3 +879,5 @@ static void __devinit quirk_usb_early_ha
-               quirk_usb_handoff_xhci(pdev);
+@@ -894,3 +896,5 @@ static void __devinit quirk_usb_early_ha
+       pci_disable_device(pdev);

  }
  DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
 +
  }
  DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
 +

diff --git a/target/linux/generic/patches-3.3/863-gpiommc.patch b/target/linux/generic/patches-3.3/863-gpiommc.patch
index 3052a38..8a37c8e 100644 (file)
--- a/target/linux/generic/patches-3.3/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.3/863-gpiommc.patch
@@ -830,7 +830,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -3019,6 +3019,11 @@ L:      linuxppc-dev@lists.ozlabs.org
+@@ -3018,6 +3018,11 @@ L:      linuxppc-dev@lists.ozlabs.org

  S:    Odd Fixes
  F:    drivers/tty/hvc/
  
  S:    Odd Fixes
  F:    drivers/tty/hvc/