Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>
2008-08-06 14:05:38 +02:00
parent 9246f5ecfd
commit f2302d4430
132 changed files with 1173 additions and 1771 deletions
--- a/post/cpu/ppc4xx/spr.c
+++ b/post/cpu/ppc4xx/spr.c
@@ -76,7 +76,9 @@ static struct {
 	{0x3b,	"CSRR1",	0x00000000,	0x00000000},
 	{0x3d,	"DEAR",		0x00000000,	0x00000000},
 	{0x3e,	"ESR",		0x00000000,	0x00000000},
+#ifdef CONFIG_440
 	{0x3f,	"IVPR",		0xffff0000,	0x00000000},
+#endif
 	{0x100,	"USPRG0",	0x00000000,	0x00000000},
 	{0x104,	"SPRG4",	0x00000000,	0x00000000},
 	{0x105,	"SPRG5",	0x00000000,	0x00000000},