From ff576aaee12f99ce5feef92bb1c1b134ce3427b7 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 12 Jul 2006 15:41:30 +1000 Subject: [PATCH] --- yaml --- r: 34059 b: refs/heads/master c: 5c339e96a391476ebb7cc63d913445c8cee092ff h: refs/heads/master i: 34057: cba364218dd09ee8bcc5b40d0cf6f10c327c9a08 34055: 0115ce4716e055d3874d96f402b75e259d2e6572 v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_atmel.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ebc24dd66c3a..8a7649cc5c40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abddd185a0195988b8a5e802d55aff91783489de +refs/heads/master: 5c339e96a391476ebb7cc63d913445c8cee092ff diff --git a/trunk/drivers/char/tpm/tpm_atmel.h b/trunk/drivers/char/tpm/tpm_atmel.h index 2e68eeb8a2cd..aefd683c60b7 100644 --- a/trunk/drivers/char/tpm/tpm_atmel.h +++ b/trunk/drivers/char/tpm/tpm_atmel.h @@ -37,7 +37,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) { struct device_node *dn; unsigned long address, size; - unsigned int *reg; + const unsigned int *reg; int reglen; int naddrc; int nsizec; @@ -52,7 +52,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) return NULL; } - reg = (unsigned int *) get_property(dn, "reg", ®len); + reg = get_property(dn, "reg", ®len); naddrc = prom_n_addr_cells(dn); nsizec = prom_n_size_cells(dn);