summaryrefslogtreecommitdiff
path: root/target/linux/generic
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-07-08 22:44:34 +0000
committerLuka Perkov <luka@openwrt.org>2014-07-08 22:44:34 +0000
commit90b53991a09578730fab41445e7cbbeb028af722 (patch)
treeb78b4e104087026c9a847e8240e9e29d952b512d /target/linux/generic
parent8630d101b7db9c19b19c714bb3335042098ed2ee (diff)
downloadmtk-20170518-90b53991a09578730fab41445e7cbbeb028af722.zip
mtk-20170518-90b53991a09578730fab41445e7cbbeb028af722.tar.gz
mtk-20170518-90b53991a09578730fab41445e7cbbeb028af722.tar.bz2
kernel: update 3.14 to 3.14.11
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 41551
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch2
-rw-r--r--target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch b/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch
index 9ca8ac1..0235340 100644
--- a/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch
+++ b/target/linux/generic/patches-3.14/550-ubifs-symlink-xattr-support.patch
@@ -1,6 +1,6 @@
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
-@@ -1577,6 +1577,10 @@ const struct inode_operations ubifs_syml
+@@ -1576,6 +1576,10 @@ const struct inode_operations ubifs_syml
.follow_link = ubifs_follow_link,
.setattr = ubifs_setattr,
.getattr = ubifs_getattr,
diff --git a/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
index 8877bc0..e4becb3 100644
--- a/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
@@ -40,9 +40,9 @@
/*
* Some BIOS implementations leave the Intel GPU interrupts enabled,
* even though no one is handling them (f.e. i915 driver is never loaded).
-@@ -2950,6 +2954,8 @@ static void disable_igfx_irq(struct pci_
- DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
+@@ -2951,6 +2955,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);
+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+