summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbcon-iplan2p8.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-04-28 01:09:25 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-04-28 01:09:25 +0000
commitb9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch)
tree42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/video/fbcon-iplan2p8.c
parent7406b0a326f2d70ade2671c37d1beef62249db97 (diff)
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/video/fbcon-iplan2p8.c')
-rw-r--r--drivers/video/fbcon-iplan2p8.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbcon-iplan2p8.c b/drivers/video/fbcon-iplan2p8.c
index 4ee366019..bc3730a1f 100644
--- a/drivers/video/fbcon-iplan2p8.c
+++ b/drivers/video/fbcon-iplan2p8.c
@@ -17,7 +17,10 @@
#include <linux/fb.h>
#include <asm/byteorder.h>
+
+#ifdef __mc68000__
#include <asm/setup.h>
+#endif
#include <video/fbcon.h>
#include <video/fbcon-iplan2p8.h>