diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-06-14 09:45:26 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-06-14 09:45:26 +0000 |
commit | 567b6d1a271d901aa381e70b2060bacfbc51bd50 (patch) | |
tree | 8aa45ae425a947b20405494803a5903698df73fc /target/linux/generic-2.6/patches-2.6.30 | |
parent | b63576359d0c3bc56b9b1326217b9a8ee318c3fb (diff) | |
download | upstream-567b6d1a271d901aa381e70b2060bacfbc51bd50.tar.gz upstream-567b6d1a271d901aa381e70b2060bacfbc51bd50.tar.bz2 upstream-567b6d1a271d901aa381e70b2060bacfbc51bd50.zip |
refresh patches
SVN-Revision: 16444
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
3 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch index 6799fdbb8b..57dcc1dc43 100644 --- a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch +++ b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch @@ -132,7 +132,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -802,6 +802,9 @@ config MIPS_DISABLE_OBSOLETE_IDE +@@ -803,6 +803,9 @@ config MIPS_DISABLE_OBSOLETE_IDE config SYNC_R4K bool diff --git a/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch b/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch index 463dbc60f1..49045fea31 100644 --- a/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch +++ b/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -804,6 +804,9 @@ config SYNC_R4K +@@ -805,6 +805,9 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch b/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch index 0d22636ab6..128ed54ecb 100644 --- a/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch +++ b/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch @@ -6,8 +6,6 @@ Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> arch/mips/lib/delay.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c -index f69c6b5..6b3b1de 100644 --- a/arch/mips/lib/delay.c +++ b/arch/mips/lib/delay.c @@ -43,7 +43,7 @@ void __udelay(unsigned long us) @@ -27,6 +25,3 @@ index f69c6b5..6b3b1de 100644 + __delay((ns * 0x00000005ull * HZ * lpj) >> 32); } EXPORT_SYMBOL(__ndelay); - - - |