diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /drivers/video/matrox/matroxfb_base.h | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'drivers/video/matrox/matroxfb_base.h')
| -rw-r--r-- | drivers/video/matrox/matroxfb_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h index 0cb21b0f9..c8a47fe9e 100644 --- a/drivers/video/matrox/matroxfb_base.h +++ b/drivers/video/matrox/matroxfb_base.h @@ -56,10 +56,10 @@ #include <video/fbcon-cfb24.h> #include <video/fbcon-cfb32.h> -#if defined(CONFIG_FB_OF) #if defined(CONFIG_FB_COMPAT_XPMAC) #include <asm/vc_ioctl.h> #endif +#if defined(CONFIG_PPC) #include <asm/prom.h> #include <asm/pci-bridge.h> #include <video/macmodes.h> @@ -544,7 +544,7 @@ struct matrox_fb_info { struct timer_list timer; } cursor; struct { unsigned red, green, blue, transp; } palette[256]; -#if defined(CONFIG_FB_OF) && defined(CONFIG_FB_COMPAT_XPMAC) +#if defined(CONFIG_FB_COMPAT_XPMAC) char matrox_name[32]; #endif /* These ifdefs must be last! They differ for module & non-module compiles */ |