diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-06-05 13:40:38 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-06-05 13:40:38 +0000 |
| commit | 18ad7d53f31918288511d5b7a71ca4be5e7a7aab (patch) | |
| tree | 88a28cba300ae390af60c6a4c352fe385a465c75 /target | |
| parent | c349282efff8e729f0a7ed6069539da39ba9332b (diff) | |
| download | upstream-18ad7d53f31918288511d5b7a71ca4be5e7a7aab.tar.gz upstream-18ad7d53f31918288511d5b7a71ca4be5e7a7aab.tar.bz2 upstream-18ad7d53f31918288511d5b7a71ca4be5e7a7aab.zip | |
[kernel/3.3] refresh generic patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32059 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
5 files changed, 11 insertions, 15 deletions
diff --git a/target/linux/generic/patches-3.3/653-disable_netlink_trim.patch b/target/linux/generic/patches-3.3/653-disable_netlink_trim.patch index c6c7c75a9e..ffa6502cd6 100644 --- a/target/linux/generic/patches-3.3/653-disable_netlink_trim.patch +++ b/target/linux/generic/patches-3.3/653-disable_netlink_trim.patch @@ -1,6 +1,6 @@ --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -854,25 +854,7 @@ void netlink_detachskb(struct sock *sk, +@@ -854,25 +854,7 @@ void netlink_detachskb(struct sock *sk, static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { diff --git a/target/linux/generic/patches-3.3/729-phy-tantos.patch b/target/linux/generic/patches-3.3/729-phy-tantos.patch index 203b3e6ab8..890d40c4d6 100644 --- a/target/linux/generic/patches-3.3/729-phy-tantos.patch +++ b/target/linux/generic/patches-3.3/729-phy-tantos.patch @@ -1,8 +1,6 @@ -Index: linux-3.3.7/drivers/net/phy/Kconfig -=================================================================== ---- linux-3.3.7.orig/drivers/net/phy/Kconfig 2012-05-27 18:09:00.129697447 +0200 -+++ linux-3.3.7/drivers/net/phy/Kconfig 2012-05-29 18:31:44.462611635 +0200 -@@ -207,3 +207,7 @@ +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -206,3 +206,7 @@ endif # PHYLIB config MICREL_KS8995MA tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch" depends on SPI @@ -10,11 +8,9 @@ Index: linux-3.3.7/drivers/net/phy/Kconfig +config PSB6970_PHY + tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch" + select SWCONFIG -Index: linux-3.3.7/drivers/net/phy/Makefile -=================================================================== ---- linux-3.3.7.orig/drivers/net/phy/Makefile 2012-05-27 18:09:00.129697447 +0200 -+++ linux-3.3.7/drivers/net/phy/Makefile 2012-05-29 18:30:59.286610634 +0200 -@@ -28,6 +28,7 @@ +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb obj-$(CONFIG_RTL8367_PHY) += rtl8367.o obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o obj-$(CONFIG_MICREL_PHY) += micrel.o 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 d4fa69d239..ce50afa8e4 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 @@ -1,7 +1,7 @@ --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c -@@ -431,6 +431,8 @@ reset_needed: +@@ -432,6 +432,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; -@@ -898,3 +900,5 @@ static void __devinit quirk_usb_early_ha +@@ -928,3 +930,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/920-unable_to_open_console.patch b/target/linux/generic/patches-3.3/920-unable_to_open_console.patch index f08a59f82e..11f67dc2c9 100644 --- a/target/linux/generic/patches-3.3/920-unable_to_open_console.patch +++ b/target/linux/generic/patches-3.3/920-unable_to_open_console.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -815,7 +815,7 @@ static int __init kernel_init(void * unu +@@ -816,7 +816,7 @@ static int __init kernel_init(void * unu /* Open the /dev/console on the rootfs, this should never fail */ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) diff --git a/target/linux/generic/patches-3.3/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.3/921-use_preinit_as_init.patch index 395cb6ddbe..a71251dcd7 100644 --- a/target/linux/generic/patches-3.3/921-use_preinit_as_init.patch +++ b/target/linux/generic/patches-3.3/921-use_preinit_as_init.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -777,10 +777,7 @@ static noinline int init_post(void) +@@ -774,10 +774,7 @@ static noinline int init_post(void) printk(KERN_WARNING "Failed to execute %s. Attempting " "defaults...\n", execute_command); } |