diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-08-28 22:59:54 +0000 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 1998-08-28 22:59:54 +0000 |
| commit | fce3438cc02a4cd0dbcfb2ef4ce730c3e0f02dff (patch) | |
| tree | 6b0d693ccfe52e8670d3e4263ba245e24a26ce79 | |
| parent | 0fbcf35327b95495125805beb63433f3ae930453 (diff) | |
corrected g364fb configuration
| -rw-r--r-- | drivers/video/Config.in | 3 | ||||
| -rw-r--r-- | drivers/video/Makefile | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/video/Config.in b/drivers/video/Config.in index 82d77bd12..20f3746fd 100644 --- a/drivers/video/Config.in +++ b/drivers/video/Config.in @@ -138,7 +138,8 @@ if [ "$CONFIG_FB" = "y" ]; then "$CONFIG_FB_OF" = "y" -o "$CONFIG_FB_TGA" = "y" -o \ "$CONFIG_FB_VESA" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" -o \ "$CONFIG_FB_TCX" = "y" -o "$CONFIG_FB_CGTHREE" = "y" -o \ - "$CONFIG_FB_CONTROL" = "y" -o "$CONFIG_FB_CLGEN" = "y" ]; then + "$CONFIG_FB_CONTROL" = "y" -o "$CONFIG_FB_CLGEN" = "y" -o \ + "$CONFIG_FB_G364" = "y" ]; then define_bool CONFIG_FBCON_CFB8 y else if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \ diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 412754020..27365240a 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -188,6 +188,10 @@ else endif endif +ifdef CONFIG_FB_G364 +L_OBJS := $(L_OBJS) g364fb.o +endif + ifeq ($(CONFIG_FB_SBUS),y) L_OBJS += sbusfb.o ifeq ($(CONFIG_FB_CREATOR),y) @@ -413,12 +417,6 @@ ifdef CONFIG_SGI L_OBJS := $(L_OBJS) newport_con.o endif -# G364 Console for Mips Magnum 4000 / Olivetti M700-10 - -ifdef CONFIG_VIDEO_G364 -L_OBJS := $(L_OBJS) g364fb.o -endif - include $(TOPDIR)/Rules.make gspcore.c: gspcore.gsp |