summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-11-29 12:09:42 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-11-29 12:09:42 +0000
commit6384a68295482b34bfe359b1dfd7d2bdecc8fd6c (patch)
tree4f3a81776b1b9457fa1da236b1cc1e2949544e1f /target/linux/generic-2.6
parent32e3529836aad24907fab8bf73250825fc8b233c (diff)
downloadmtk-20170518-6384a68295482b34bfe359b1dfd7d2bdecc8fd6c.zip
mtk-20170518-6384a68295482b34bfe359b1dfd7d2bdecc8fd6c.tar.gz
mtk-20170518-6384a68295482b34bfe359b1dfd7d2bdecc8fd6c.tar.bz2
Remove patches already applied in generic and refresh patches.
This fixes #6200 SVN-Revision: 18597
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/976-ssb_update.patch8
2 files changed, 9 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch b/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
index f78bba8..3e8d1fb 100644
--- a/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/230-add-r_arm_v4bx-relocation-for-arm-module-loader.patch
@@ -10,7 +10,7 @@
* These are used to set parameters in the core dumps.
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
-@@ -132,6 +132,15 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
+@@ -136,6 +136,15 @@ apply_relocate(Elf32_Shdr *sechdrs, cons
*(u32 *)loc |= offset & 0x00ffffff;
break;
diff --git a/target/linux/generic-2.6/patches-2.6.28/976-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.28/976-ssb_update.patch
index cd44b98..279a116 100644
--- a/target/linux/generic-2.6/patches-2.6.28/976-ssb_update.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/976-ssb_update.patch
@@ -1440,6 +1440,14 @@
static inline u32 chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset,
u32 mask, u32 value)
{
+@@ -246,6 +233,7 @@ void ssb_chipcommon_init(struct ssb_chip
+ {
+ if (!cc->dev)
+ return; /* We don't have a ChipCommon */
++ ssb_pmu_init(cc);
+ chipco_powercontrol_init(cc);
+ ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
+ calc_fast_powerup_delay(cc);
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -175,6 +175,8 @@ static u32 scan_read32(struct ssb_bus *b