Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / arch / powerpc / sysdev / fsl_soc.c

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 8a123c71449fffd9315b085158f0e1a8d6f5795a..cad175724359df4099a84b00c4af154cbd2362a5 100644 (file)
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -907,7 +907,7 @@ static int __init fs_enet_of_init(void)
                struct fs_platform_info fs_enet_data;
                const unsigned int *id;
                const unsigned int *phy_addr;
-               void *mac_addr;
+               const void *mac_addr;
                const phandle *ph;
                const char *model;