diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-05-17 22:05:07 +0000 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-05-17 22:05:07 +0000 |
commit | ba30e23bbc9ab366184e8738847a45bc5cf05dba (patch) | |
tree | afac8ae75d0b64df9c280dd07107abb822349822 /target/linux/generic-2.6/patches-2.6.34 | |
parent | 0745a63313b58cb7aef7aa21840b7748e95dac1e (diff) | |
download | upstream-ba30e23bbc9ab366184e8738847a45bc5cf05dba.tar.gz upstream-ba30e23bbc9ab366184e8738847a45bc5cf05dba.tar.bz2 upstream-ba30e23bbc9ab366184e8738847a45bc5cf05dba.zip |
Add checksum for 2.6.34, refresh 2.6.34 patches and update targets from 2.6.34-rcX to 2.6.34
SVN-Revision: 21498
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34')
9 files changed, 15 insertions, 15 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch index 00de8d5450..a304f0bcc7 100644 --- a/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch +++ b/target/linux/generic-2.6/patches-2.6.34/021-mips_image_cmdline_hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -854,6 +854,10 @@ config SYNC_R4K +@@ -856,6 +856,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch index e6b764e2df..a65be6f2cf 100644 --- a/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch +++ b/target/linux/generic-2.6/patches-2.6.34/025-mips_disable_fpu.patch @@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> -- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -839,6 +839,17 @@ config I8259 +@@ -841,6 +841,17 @@ config I8259 config MIPS_BONITO64 bool @@ -70,7 +70,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> /* Control registers */ #define FPCREG_RID 0 /* $0 = revision id */ -@@ -1277,7 +1277,6 @@ int fpu_emulator_cop1Handler(struct pt_r +@@ -1284,7 +1284,6 @@ int fpu_emulator_cop1Handler(struct pt_r return sig; } @@ -78,7 +78,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> #ifdef CONFIG_DEBUG_FS static int fpuemu_stat_get(void *data, u64 *val) -@@ -1326,4 +1325,11 @@ static int __init debugfs_fpuemu(void) +@@ -1333,4 +1332,11 @@ static int __init debugfs_fpuemu(void) return 0; } __initcall(debugfs_fpuemu); diff --git a/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch index 71554d1d3f..8a0507fa01 100644 --- a/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.34/150-netfilter_imq.patch @@ -945,7 +945,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/stat.h> -@@ -1860,7 +1863,11 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -1859,7 +1862,11 @@ int dev_hard_start_xmit(struct sk_buff * int rc = NETDEV_TX_OK; if (likely(!skb->next)) { @@ -958,7 +958,7 @@ dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -@@ -1970,8 +1977,7 @@ static inline u16 dev_cap_txqueue(struct +@@ -1969,8 +1976,7 @@ static inline u16 dev_cap_txqueue(struct return queue_index; } @@ -968,7 +968,7 @@ { u16 queue_index; struct sock *sk = skb->sk; -@@ -2001,6 +2007,7 @@ static struct netdev_queue *dev_pick_tx( +@@ -2000,6 +2006,7 @@ static struct netdev_queue *dev_pick_tx( skb_set_queue_mapping(skb, queue_index); return netdev_get_tx_queue(dev, queue_index); } @@ -1183,7 +1183,7 @@ /* return EBUSY when somebody else is registered, return EEXIST if the * same handler is registered, return 0 in case of success. */ int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh) -@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const +@@ -81,7 +101,7 @@ void nf_unregister_queue_handlers(const } EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers); diff --git a/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch index b3e469a8d6..86bab7a1eb 100644 --- a/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch +++ b/target/linux/generic-2.6/patches-2.6.34/620-phy_adm6996.patch @@ -1,8 +1,8 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -88,6 +88,11 @@ config LSI_ET1011C_PHY +@@ -93,6 +93,11 @@ config MICREL_PHY ---help--- - Supports the LSI ET1011C PHY. + Supports the KSZ9021, VSC8201, KS8001 PHYs. +config ADM6996_PHY + tristate "Driver for ADM6996 switches" diff --git a/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch b/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch index 36551fd570..f5ff558b0f 100644 --- a/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch +++ b/target/linux/generic-2.6/patches-2.6.34/660-phy_mvswitch.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -99,6 +99,9 @@ config ADM6996_PHY +@@ -104,6 +104,9 @@ config ADM6996_PHY ---help--- Currently supports the ADM6996F switch diff --git a/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch b/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch index 862868c8d1..e8c57cada0 100644 --- a/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch +++ b/target/linux/generic-2.6/patches-2.6.34/670-phy_ip175c.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -102,6 +102,10 @@ config ADM6996_PHY +@@ -107,6 +107,10 @@ config ADM6996_PHY config MVSWITCH_PHY tristate "Driver for Marvell 88E6060 switches" diff --git a/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch index 00372aae0e..2bc9d6754d 100644 --- a/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch +++ b/target/linux/generic-2.6/patches-2.6.34/680-phy_ar8216.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -106,6 +106,10 @@ config IP175C_PHY +@@ -111,6 +111,10 @@ config IP175C_PHY tristate "Driver for IC+ IP175C/IP178C switches" select SWCONFIG diff --git a/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch b/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch index a4793cb63b..9e86748a86 100644 --- a/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch +++ b/target/linux/generic-2.6/patches-2.6.34/690-phy_rtl8306.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -110,6 +110,10 @@ config AR8216_PHY +@@ -115,6 +115,10 @@ config AR8216_PHY tristate "Driver for Atheros AR8216 switches" select SWCONFIG diff --git a/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch b/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch index 0963bd81be..ec07636308 100644 --- a/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch +++ b/target/linux/generic-2.6/patches-2.6.34/691-phy_rtl8366.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -152,4 +152,29 @@ config MDIO_OCTEON +@@ -157,4 +157,29 @@ config MDIO_OCTEON If in doubt, say Y. |