aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-02-12 09:51:11 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-02-12 09:51:11 +0000
commitbae4bfe3f8af559cfa69bd38a57c93f4c9db6dd2 (patch)
treeaef551322c22c2cdda35e59ecdcdbfce0ae9535a /target/linux/generic
parent99b69fd9c5a5645f2894da031832b9cfd8d4ab8e (diff)
downloadupstream-bae4bfe3f8af559cfa69bd38a57c93f4c9db6dd2.tar.gz
upstream-bae4bfe3f8af559cfa69bd38a57c93f4c9db6dd2.tar.bz2
upstream-bae4bfe3f8af559cfa69bd38a57c93f4c9db6dd2.zip
kernel: update linux 3.7 to 3.7.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 35571
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.7/102-ehci_hcd_ignore_oc.patch2
-rw-r--r--target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.7/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.7/102-ehci_hcd_ignore_oc.patch
index bf1815a2e1..dfcfc26384 100644
--- a/target/linux/generic/patches-3.7/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.7/102-ehci_hcd_ignore_oc.patch
@@ -20,7 +20,7 @@
mask = PORT_CSC | PORT_PEC | PORT_OCC;
else
mask = PORT_CSC | PORT_PEC;
-@@ -804,7 +804,7 @@ static int ehci_hub_control (
+@@ -808,7 +808,7 @@ static int ehci_hub_control (
if (temp & PORT_PEC)
status |= USB_PORT_STAT_C_ENABLE << 16;
diff --git a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
index 1c90a5cfbe..da73f6719f 100644
--- a/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/patches-3.7/811-pci_disable_usb_common_quirks.patch
@@ -39,7 +39,7 @@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
-@@ -973,3 +988,4 @@ static void __devinit quirk_usb_early_ha
+@@ -974,3 +989,4 @@ static void __devinit quirk_usb_early_ha
}
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);