diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/video/fbcon-iplan2p2.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/video/fbcon-iplan2p2.c')
| -rw-r--r-- | drivers/video/fbcon-iplan2p2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbcon-iplan2p2.c b/drivers/video/fbcon-iplan2p2.c index c8d6838be..0c0bfa21f 100644 --- a/drivers/video/fbcon-iplan2p2.c +++ b/drivers/video/fbcon-iplan2p2.c @@ -10,7 +10,6 @@ * more details. */ -#include <linux/config.h> #include <linux/module.h> #include <linux/tty.h> #include <linux/console.h> @@ -18,6 +17,7 @@ #include <linux/fb.h> #include <asm/byteorder.h> +#include <asm/setup.h> #include <video/fbcon.h> #include <video/fbcon-iplan2p2.h> @@ -43,7 +43,7 @@ static const u8 color_2p[] = { 0, 0, 0, 1, 0, 1, 1, 1, 2, 2, 2, 3, 2, 3, 3, 3 }; /* Perform the m68k movepw operation. */ static inline void movepw(u8 *d, u16 val) { -#if defined __mc68000__ && !defined CONFIG_OPTIMIZE_060 +#if defined __mc68000__ && !defined CPU_M68060_ONLY asm volatile ("movepw %1,%0@(0)" : : "a" (d), "d" (val)); #else d[0] = (val >> 16) & 0xff; |