diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /drivers/video/valkyriefb.c | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'drivers/video/valkyriefb.c')
| -rw-r--r-- | drivers/video/valkyriefb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index 2541d14a4..a60774a61 100644 --- a/drivers/video/valkyriefb.c +++ b/drivers/video/valkyriefb.c @@ -55,11 +55,11 @@ #ifdef CONFIG_FB_COMPAT_XPMAC #include <asm/vc_ioctl.h> #endif +#include <linux/adb.h> +#include <linux/cuda.h> #include <asm/io.h> #include <asm/prom.h> #include <asm/pgtable.h> -#include <asm/adb.h> -#include <asm/cuda.h> #include <video/fbcon.h> #include <video/fbcon-cfb8.h> @@ -168,10 +168,6 @@ static int valkyriefb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info); static void do_install_cmap(int con, struct fb_info *info); - -__openfirmware - - static int valkyrie_open(struct fb_info *info, int user) { MOD_INC_USE_COUNT; |