diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 13:24:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-21 13:24:16 -0800 |
| commit | c745552a82cbf3a82adea5210212ed31ec03388d (patch) | |
| tree | e9ca2570ad93965fd590e1c9717415709a836ad9 /arch | |
| parent | d41ad6df44fbd01837211cee3273ce2f9445be6e (diff) | |
| parent | 5d1034f01b3616d6636ab7851ad9e63d42abbbd6 (diff) | |
| download | linux-c745552a82cbf3a82adea5210212ed31ec03388d.tar.gz linux-c745552a82cbf3a82adea5210212ed31ec03388d.tar.bz2 linux-c745552a82cbf3a82adea5210212ed31ec03388d.zip | |
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.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc830x_rdb.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc831x_rdb.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c index 661d354e4ff2..d0c4e15b7794 100644 --- a/arch/powerpc/platforms/83xx/mpc830x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c @@ -57,12 +57,12 @@ static void __init mpc830x_rdb_init_IRQ(void) ipic_set_default_priority(); } -struct const char *board[] __initdata = { +static const char *board[] __initdata = { "MPC8308RDB", "fsl,mpc8308rdb", "denx,mpc8308_p1m", NULL -} +}; /* * Called very early, MMU is off, device-tree isn't unflattened diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c index b54cd736a895..f859ead49a8d 100644 --- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c @@ -60,11 +60,11 @@ static void __init mpc831x_rdb_init_IRQ(void) ipic_set_default_priority(); } -struct const char *board[] __initdata = { +static const char *board[] __initdata = { "MPC8313ERDB", "fsl,mpc8315erdb", NULL -} +}; /* * Called very early, MMU is off, device-tree isn't unflattened |