summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'cpu')
-rw-r--r--cpu/i386/sc520.c2
-rw-r--r--cpu/mpc8xx/cpu.c2
-rw-r--r--cpu/mpc8xx/video.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/cpu/i386/sc520.c b/cpu/i386/sc520.c
index 8bcb979c15..cb6bc03bcc 100644
--- a/cpu/i386/sc520.c
+++ b/cpu/i386/sc520.c
@@ -32,7 +32,7 @@
#include <config.h>
#include <pci.h>
#ifdef CONFIG_SC520_SSI
-#include <ssi.h>
+#include <asm/ic/ssi.h>
#endif
#include <asm/io.h>
#include <asm/pci.h>
diff --git a/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c
index 40f81efc3c..2eb848bd0e 100644
--- a/cpu/mpc8xx/cpu.c
+++ b/cpu/mpc8xx/cpu.c
@@ -644,7 +644,7 @@ void reset_8xx_watchdog (volatile immap_t * immr)
*/
int cpu_eth_init(bd_t *bis)
{
-#if defined(SCC_ENET)
+#if defined(SCC_ENET) && defined(CONFIG_CMD_NET)
scc_initialize(bis);
#endif
#if defined(FEC_ENET)
diff --git a/cpu/mpc8xx/video.c b/cpu/mpc8xx/video.c
index 54796449c4..4a59927436 100644
--- a/cpu/mpc8xx/video.c
+++ b/cpu/mpc8xx/video.c
@@ -32,10 +32,8 @@
#include <stdarg.h>
#include <common.h>
#include <config.h>
-#ifdef VIDEO_INFO
#include <version.h>
#include <timestamp.h>
-#endif
#include <i2c.h>
#include <linux/types.h>
#include <devices.h>