[GFS2] Fix up merge of Linus' kernel into GFS2

[linux-2.6-omap-h63xx.git] / drivers / char / tpm / tpm_atmel.h

diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
index 2e68eeb8a2cdfa8397dfacf58f7ac85e37585619..aefd683c60b7e6a0304c6a9b410b5e22647f8a86 100644 (file)
--- a/drivers/char/tpm/tpm_atmel.h
+++ b/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", &reglen);
+       reg = get_property(dn, "reg", &reglen);
        naddrc = prom_n_addr_cells(dn);
        nsizec = prom_n_size_cells(dn);