summaryrefslogtreecommitdiff
path: root/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2006-01-13 18:26:10 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-13 18:26:10 +0000
commite523c03092fc6cfeda92b045a4d188b328267930 (patch)
treed7e3f9b624cb642b58492bc459ad3066bb976f68 /packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch
parent1f1964e9b57efb6ec63ab857c25aa5f9a9836e88 (diff)
parent20938adc193b05ec07f801b9ed5e4c2a6c4a73c9 (diff)
merge of 464cb51e4f1333becda8dfa1ccf4f9bbcea5514f
and b3735f13f3bb7c2565ab1e628c79b04596773c15
Diffstat (limited to 'packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch')
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch b/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch
index 3d4a03f616..e8131447c8 100644
--- a/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch
@@ -215,7 +215,7 @@
-
--- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000
-@@ -119,6 +119,11 @@ static void nslu2_power_off(void)
+@@ -114,6 +114,11 @@ static void nslu2_power_off(void)
static void __init nslu2_init(void)
{