Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

[linux-beck.git] / arch / arm / include / asm / mach / arch.h

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index bcb0c883e21ed06aa18c9f48354314c877523a8b..d7692cafde7fdd3d0b4e297620fbf2dd45d611d6 100644 (file)
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -19,7 +19,7 @@ struct machine_desc {
        unsigned int            nr;             /* architecture number  */
        const char              *name;          /* architecture name    */
        unsigned long           atag_offset;    /* tagged list (relative) */
-       const char              **dt_compat;    /* array of device tree
+       const char *const       *dt_compat;     /* array of device tree
                                                 * 'compatible' strings */
 
        unsigned int            nr_irqs;        /* number of IRQs */