diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-19 19:46:52 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-19 19:46:52 +0000 |
commit | 828aac2ee239dca9c1856c4856a57912e6a487c4 (patch) | |
tree | 44de8a7d318bbcef29da00992ebfa7356f470af7 /arch/arm/mach-netx/xc.c | |
parent | 6fd7c7fe72a46dfd227fe8db0c7b6863af90a982 (diff) | |
parent | 7971db5a4b4176ad5df590fce07a962c643a2740 (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-netx/xc.c')
-rw-r--r-- | arch/arm/mach-netx/xc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c index 32eabf5dfa4..8fc6205dc3a 100644 --- a/arch/arm/mach-netx/xc.c +++ b/arch/arm/mach-netx/xc.c @@ -92,10 +92,10 @@ static int xc_check_ptr(struct xc *x, unsigned long adr, unsigned int size) return -1; } -static int xc_patch(struct xc *x, void *patch, int count) +static int xc_patch(struct xc *x, const void *patch, int count) { unsigned int val, adr; - unsigned int *data = patch; + const unsigned int *data = patch; int i; for (i = 0; i < count; i++) { @@ -117,7 +117,7 @@ int xc_request_firmware(struct xc *x) struct fw_header *head; unsigned int size; int i; - void *src; + const void *src; unsigned long dst; sprintf(name, "xc%d.bin", x->no); |