diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-22 16:04:25 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-07-22 16:04:25 +0000 |
| commit | 39f491e479eb74e6645ea6dce2219ff7d26570d1 (patch) | |
| tree | 85bd63e501b1abf2d5ee1d46ff85b177570ffcd0 /target/linux/generic/patches-3.0 | |
| parent | 365f76551af6786d9dda6cb20463a7c37321150e (diff) | |
| download | upstream-39f491e479eb74e6645ea6dce2219ff7d26570d1.tar.gz upstream-39f491e479eb74e6645ea6dce2219ff7d26570d1.tar.bz2 upstream-39f491e479eb74e6645ea6dce2219ff7d26570d1.zip | |
kernel: update to linux-3.0 and refresh patches.
Thank you Peter Wagner for the patch
SVN-Revision: 27722
Diffstat (limited to 'target/linux/generic/patches-3.0')
5 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.0/020-ssb_update.patch b/target/linux/generic/patches-3.0/020-ssb_update.patch index a310d90f92..817c4f4ddd 100644 --- a/target/linux/generic/patches-3.0/020-ssb_update.patch +++ b/target/linux/generic/patches-3.0/020-ssb_update.patch @@ -77,15 +77,17 @@ { u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0)); if (((tmp & 0xF000) >> 12) != pc->dev->core_index) { -@@ -514,13 +514,13 @@ static void ssb_pcicore_pcie_setup_worka +@@ -514,7 +514,7 @@ static void ssb_pcicore_pcie_setup_worka * Generic and Clientmode operation code. **************************************************/ -static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) +static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) { - /* Disable PCI interrupts. */ - ssb_write32(pc->dev, SSB_INTVEC, 0); + ssb_pcicore_fix_sprom_core_index(pc); + +@@ -529,7 +529,7 @@ static void ssb_pcicore_init_clientmode( + } } -void ssb_pcicore_init(struct ssb_pcicore *pc) diff --git a/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch b/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch index 4875d5f23f..147b28366a 100644 --- a/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch +++ b/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch @@ -1,6 +1,6 @@ --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c -@@ -855,7 +855,7 @@ static int pppoe_sendmsg(struct kiocb *i +@@ -856,7 +856,7 @@ static int pppoe_sendmsg(struct kiocb *i goto end; @@ -9,7 +9,7 @@ 0, GFP_KERNEL); if (!skb) { error = -ENOMEM; -@@ -863,7 +863,7 @@ static int pppoe_sendmsg(struct kiocb *i +@@ -864,7 +864,7 @@ static int pppoe_sendmsg(struct kiocb *i } /* Reserve space for headers. */ diff --git a/target/linux/generic/patches-3.0/721-phy_packets.patch b/target/linux/generic/patches-3.0/721-phy_packets.patch index ab86bbea3b..988212edb2 100644 --- a/target/linux/generic/patches-3.0/721-phy_packets.patch +++ b/target/linux/generic/patches-3.0/721-phy_packets.patch @@ -53,7 +53,7 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1194,6 +1194,7 @@ struct net_device { +@@ -1188,6 +1188,7 @@ struct net_device { void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch index b9e6f40885..a37be04e17 100644 --- a/target/linux/generic/patches-3.0/950-vm_exports.patch +++ b/target/linux/generic/patches-3.0/950-vm_exports.patch @@ -61,7 +61,7 @@ { --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -4905,6 +4905,7 @@ int can_nice(const struct task_struct *p +@@ -4937,6 +4937,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } diff --git a/target/linux/generic/patches-3.0/999-drop_sublevel.patch b/target/linux/generic/patches-3.0/999-drop_sublevel.patch index f85fc861f0..ed938e0d92 100644 --- a/target/linux/generic/patches-3.0/999-drop_sublevel.patch +++ b/target/linux/generic/patches-3.0/999-drop_sublevel.patch @@ -4,6 +4,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 0 - EXTRAVERSION = -rc7 + EXTRAVERSION = NAME = Sneaky Weasel |