summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/compressed/ofw-shark.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-23 19:03:21 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-23 19:03:21 -0400
commit536f8098026bde1368bbfcbcb9682a7637b73df2 (patch)
treecf83d2e1afa503b6aeba103b55cd1da0af4e7a4c /arch/arm/boot/compressed/ofw-shark.c
parente86ee6682b649183c11013a98be02f25e9ae399d (diff)
parent3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da (diff)
downloadlinux-536f8098026bde1368bbfcbcb9682a7637b73df2.tar.gz
linux-536f8098026bde1368bbfcbcb9682a7637b73df2.tar.bz2
linux-536f8098026bde1368bbfcbcb9682a7637b73df2.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/boot/compressed/ofw-shark.c')
-rw-r--r--arch/arm/boot/compressed/ofw-shark.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/ofw-shark.c b/arch/arm/boot/compressed/ofw-shark.c
index 7f6f5db0d060..465c54b6b128 100644
--- a/arch/arm/boot/compressed/ofw-shark.c
+++ b/arch/arm/boot/compressed/ofw-shark.c
@@ -256,5 +256,5 @@ asmlinkage void ofw_init(ofw_handle_t o, int *nomr, int *pointer)
temp[11]='\0';
mem_len = OF_getproplen(o,phandle, temp);
OF_getprop(o,phandle, temp, buffer, mem_len);
- (unsigned char) pointer[32] = ((unsigned char *) buffer)[mem_len-2];
+ * ((unsigned char *) &pointer[32]) = ((unsigned char *) buffer)[mem_len-2];
}