summaryrefslogtreecommitdiff
path: root/target/linux/generic
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.1/020-ssb_update.patch19
-rw-r--r--target/linux/generic/patches-3.1/100-overlayfs_v11.patch4
-rw-r--r--target/linux/generic/patches-3.1/720-phy_adm6996.patch2
-rw-r--r--target/linux/generic/patches-3.1/722-phy_mvswitch.patch2
-rw-r--r--target/linux/generic/patches-3.1/723-phy_ip175c.patch2
-rw-r--r--target/linux/generic/patches-3.1/724-phy_ar8216.patch2
-rw-r--r--target/linux/generic/patches-3.1/725-phy_rtl8306.patch2
-rw-r--r--target/linux/generic/patches-3.1/726-phy_rtl8366.patch2
-rw-r--r--target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch4
9 files changed, 10 insertions, 29 deletions
diff --git a/target/linux/generic/patches-3.1/020-ssb_update.patch b/target/linux/generic/patches-3.1/020-ssb_update.patch
index 9dc63adfa2..c67097b3e6 100644
--- a/target/linux/generic/patches-3.1/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.1/020-ssb_update.patch
@@ -8,25 +8,6 @@
#include <linux/ssb/ssb.h>
#include "ssb_private.h"
---- a/drivers/ssb/driver_pcicore.c
-+++ b/drivers/ssb/driver_pcicore.c
-@@ -516,10 +516,14 @@ static void ssb_pcicore_pcie_setup_worka
-
- static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
- {
-- ssb_pcicore_fix_sprom_core_index(pc);
-+ struct ssb_device *pdev = pc->dev;
-+ struct ssb_bus *bus = pdev->bus;
-+
-+ if (bus->bustype == SSB_BUSTYPE_PCI)
-+ ssb_pcicore_fix_sprom_core_index(pc);
-
- /* Disable PCI interrupts. */
-- ssb_write32(pc->dev, SSB_INTVEC, 0);
-+ ssb_write32(pdev, SSB_INTVEC, 0);
-
- /* Additional PCIe always once-executed workarounds */
- if (pc->dev->id.coreid == SSB_DEV_PCIE) {
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -12,6 +12,7 @@
diff --git a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
index 9870000d3b..f995a56030 100644
--- a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
+++ b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
@@ -254,7 +254,7 @@
rc = PTR_ERR(inode);
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1495,6 +1495,23 @@ void drop_collected_mounts(struct vfsmou
+@@ -1492,6 +1492,23 @@ void drop_collected_mounts(struct vfsmou
release_mounts(&umount_list);
}
@@ -3154,7 +3154,7 @@
} ____cacheline_aligned;
struct seq_file;
-@@ -2022,6 +2034,7 @@ extern long do_sys_open(int dfd, const c
+@@ -2023,6 +2035,7 @@ extern long do_sys_open(int dfd, const c
extern struct file *filp_open(const char *, int, int);
extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int);
diff --git a/target/linux/generic/patches-3.1/720-phy_adm6996.patch b/target/linux/generic/patches-3.1/720-phy_adm6996.patch
index 9e8e56678b..d4dbbb5c88 100644
--- a/target/linux/generic/patches-3.1/720-phy_adm6996.patch
+++ b/target/linux/generic/patches-3.1/720-phy_adm6996.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -98,6 +98,13 @@ config MICREL_PHY
+@@ -102,6 +102,13 @@ config MICREL_PHY
---help---
Supports the KSZ9021, VSC8201, KS8001 PHYs.
diff --git a/target/linux/generic/patches-3.1/722-phy_mvswitch.patch b/target/linux/generic/patches-3.1/722-phy_mvswitch.patch
index 2025b229a4..925cc4561f 100644
--- a/target/linux/generic/patches-3.1/722-phy_mvswitch.patch
+++ b/target/linux/generic/patches-3.1/722-phy_mvswitch.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -105,6 +105,9 @@ config ADM6996_PHY
+@@ -109,6 +109,9 @@ config ADM6996_PHY
Currently supports the ADM6996FC and ADM6996M switches.
Support for FC is very limited.
diff --git a/target/linux/generic/patches-3.1/723-phy_ip175c.patch b/target/linux/generic/patches-3.1/723-phy_ip175c.patch
index 9e13e579dd..0ac339e9a2 100644
--- a/target/linux/generic/patches-3.1/723-phy_ip175c.patch
+++ b/target/linux/generic/patches-3.1/723-phy_ip175c.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -108,6 +108,10 @@ config ADM6996_PHY
+@@ -112,6 +112,10 @@ config ADM6996_PHY
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
diff --git a/target/linux/generic/patches-3.1/724-phy_ar8216.patch b/target/linux/generic/patches-3.1/724-phy_ar8216.patch
index a718e370f1..7a51dccee8 100644
--- a/target/linux/generic/patches-3.1/724-phy_ar8216.patch
+++ b/target/linux/generic/patches-3.1/724-phy_ar8216.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -112,6 +112,10 @@ config IP17XX_PHY
+@@ -116,6 +116,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
diff --git a/target/linux/generic/patches-3.1/725-phy_rtl8306.patch b/target/linux/generic/patches-3.1/725-phy_rtl8306.patch
index a6d188f2ce..42cd274ca7 100644
--- a/target/linux/generic/patches-3.1/725-phy_rtl8306.patch
+++ b/target/linux/generic/patches-3.1/725-phy_rtl8306.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -116,6 +116,10 @@ config AR8216_PHY
+@@ -120,6 +120,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG
diff --git a/target/linux/generic/patches-3.1/726-phy_rtl8366.patch b/target/linux/generic/patches-3.1/726-phy_rtl8366.patch
index badc0a4e62..080793d707 100644
--- a/target/linux/generic/patches-3.1/726-phy_rtl8366.patch
+++ b/target/linux/generic/patches-3.1/726-phy_rtl8366.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -158,4 +158,29 @@ config MDIO_OCTEON
+@@ -162,4 +162,29 @@ config MDIO_OCTEON
If in doubt, say Y.
diff --git a/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch
index 49a88ec7e2..34e9c6398c 100644
--- a/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch
@@ -1,7 +1,7 @@
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
-@@ -429,6 +429,8 @@ reset_needed:
+@@ -430,6 +430,8 @@ reset_needed:
}
EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc);
@@ -10,7 +10,7 @@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
-@@ -882,3 +884,5 @@ static void __devinit quirk_usb_early_ha
+@@ -876,3 +878,5 @@ static void __devinit quirk_usb_early_ha
quirk_usb_handoff_xhci(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);