summaryrefslogtreecommitdiffstats
path: root/sys/dev/syscons
diff options
context:
space:
mode:
authorgonzo <gonzo@FreeBSD.org>2012-08-25 23:59:31 +0000
committergonzo <gonzo@FreeBSD.org>2012-08-25 23:59:31 +0000
commit6e2925b8b45b5d5cc76bd6271b4f44619eef4f5a (patch)
tree3dfffff58672961e90b482ff50d923de86e5f8b9 /sys/dev/syscons
parent75d2b5c3879aa6b619bc2027fecf74046ae11837 (diff)
downloadFreeBSD-src-6e2925b8b45b5d5cc76bd6271b4f44619eef4f5a.zip
FreeBSD-src-6e2925b8b45b5d5cc76bd6271b4f44619eef4f5a.tar.gz
Piggyback MIPS changes and add ARM syscons support for devices with
framebuffer While here - sort #if defined() order alphabetically
Diffstat (limited to 'sys/dev/syscons')
-rw-r--r--sys/dev/syscons/schistory.c3
-rw-r--r--sys/dev/syscons/scterm-teken.c3
-rw-r--r--sys/dev/syscons/syscons.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index cb8cfe9..be49983 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -42,7 +42,8 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/malloc.h>
-#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
+#if defined(__arm__) || defined(__mips__) || \
+ defined(__powerpc__) || defined(__sparc64__)
#include <machine/sc_machdep.h>
#else
#include <machine/pc/display.h>
diff --git a/sys/dev/syscons/scterm-teken.c b/sys/dev/syscons/scterm-teken.c
index e3395cb..e2e9118 100644
--- a/sys/dev/syscons/scterm-teken.c
+++ b/sys/dev/syscons/scterm-teken.c
@@ -40,7 +40,8 @@ __FBSDID("$FreeBSD$");
#include <sys/consio.h>
#include <sys/kbio.h>
-#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
+#if defined(__arm__) || defined(__mips__) || \
+ defined(__powerpc__) || defined(__sparc64__)
#include <machine/sc_machdep.h>
#else
#include <machine/pc/display.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index bacbb73..beb0c67 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -62,7 +62,8 @@ __FBSDID("$FreeBSD$");
#include <sys/power.h>
#include <machine/clock.h>
-#if defined(__sparc64__) || defined(__powerpc__) || defined(__mips__)
+#if defined(__arm__) || defined(__mips__) || \
+ defined(__powerpc__) || defined(__sparc64__)
#include <machine/sc_machdep.h>
#else
#include <machine/pc/display.h>
OpenPOWER on IntegriCloud