summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-03 14:10:24 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-03 14:10:24 +0000
commit419d9e2f54b51ff65399cf357ff3a2ddb8dafe52 (patch)
tree9d7e5514b95299f7604088812b535e7a5024641d
parentd5ec28c734804496aaf1118a47dfe47c4257efcf (diff)
downloadmtk-20170518-419d9e2f54b51ff65399cf357ff3a2ddb8dafe52.zip
mtk-20170518-419d9e2f54b51ff65399cf357ff3a2ddb8dafe52.tar.gz
mtk-20170518-419d9e2f54b51ff65399cf357ff3a2ddb8dafe52.tar.bz2
linux/3.3: refresh patches against 3.3-rc5
SVN-Revision: 30799
-rw-r--r--target/linux/generic/patches-3.3/100-overlayfs_v12.patch2
-rw-r--r--target/linux/generic/patches-3.3/202-reduce_module_size.patch2
-rw-r--r--target/linux/generic/patches-3.3/811-pci_disable_usb_common_quirks.patch4
-rw-r--r--target/linux/generic/patches-3.3/863-gpiommc.patch2
4 files changed, 5 insertions, 5 deletions
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
--- 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
-@@ -4924,6 +4924,13 @@ F: drivers/scsi/osd/
+@@ -4928,6 +4928,13 @@ F: drivers/scsi/osd/
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
--- 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
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ KBUILD_CFLAGS_KERNEL :=
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
--- 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;
-@@ -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);
+
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
--- 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
-@@ -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/