tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
powerpc/83xx: fix build failures on dt compatible list.

Linus Torvalds c745552a d41ad6df

+4 -4
unified split
+2 -2
arch/powerpc/platforms/83xx/mpc830x_rdb.c
··· 57 ipic_set_default_priority(); 58 } 59 60 - struct const char *board[] __initdata = { 61 "MPC8308RDB", 62 "fsl,mpc8308rdb", 63 "denx,mpc8308_p1m", 64 NULL 65 - } 66 67 /* 68 * Called very early, MMU is off, device-tree isn't unflattened
··· 57 ipic_set_default_priority(); 58 } 59 60 + static const char *board[] __initdata = { 61 "MPC8308RDB", 62 "fsl,mpc8308rdb", 63 "denx,mpc8308_p1m", 64 NULL 65 + }; 66 67 /* 68 * Called very early, MMU is off, device-tree isn't unflattened
+2 -2
arch/powerpc/platforms/83xx/mpc831x_rdb.c
··· 60 ipic_set_default_priority(); 61 } 62 63 - struct const char *board[] __initdata = { 64 "MPC8313ERDB", 65 "fsl,mpc8315erdb", 66 NULL 67 - } 68 69 /* 70 * Called very early, MMU is off, device-tree isn't unflattened
··· 60 ipic_set_default_priority(); 61 } 62 63 + static const char *board[] __initdata = { 64 "MPC8313ERDB", 65 "fsl,mpc8315erdb", 66 NULL 67 + }; 68 69 /* 70 * Called very early, MMU is off, device-tree isn't unflattened