diff -Nru a/drivers/video/Kconfig b/drivers/video/Kconfig
--- a/drivers/video/Kconfig 2005-03-07 14:08:41 -05:00
+++ b/drivers/video/Kconfig 2005-03-07 14:08:41 -05:00
@@ -5,7 +5,7 @@
menu "Graphics support"
config FB
- bool "Support for frame buffer devices"
+ tristate "Support for frame buffer devices"
---help---
The frame buffer device provides an abstraction for the graphics
hardware. It represents the frame buffer of some video hardware and
@@ -112,7 +112,7 @@
config FB_ACORN
bool "Acorn VIDC support"
- depends on FB && ARM && ARCH_ACORN
+ depends on (FB = y) && ARM && ARCH_ACORN
help
This is the frame buffer device driver for the Acorn VIDC graphics
hardware found in Acorn RISC PCs and other ARM-based machines. If
@@ -120,11 +120,11 @@
config FB_CLPS711X
bool "CLPS711X LCD support"
- depends on FB && ARM && ARCH_CLPS711X
+ depends on (FB = y) && ARM && ARCH_CLPS711X
config FB_SA1100
bool "SA-1100 LCD support"
- depends on FB && ARM && ARCH_SA1100
+ depends on (FB = y) && ARM && ARCH_SA1100
help
This is a framebuffer device for the SA-1100 LCD Controller.
See for information on framebuffer
@@ -144,12 +144,12 @@
config FB_APOLLO
bool
- depends on FB && APOLLO
+ depends on (FB = y) && APOLLO
default y
config FB_Q40
bool
- depends on FB && Q40
+ depends on (FB = y) && Q40
default y
config FB_AMIGA
@@ -201,7 +201,7 @@
config FB_VIRGE
bool "Amiga CyberVision 64/3D support "
- depends on FB && ZORRO && BROKEN
+ depends on (FB = y) && ZORRO && BROKEN
help
This enables support for the Cybervision 64/3D graphics card from
Phase5. Please note that its use is not all that intuitive (i.e. if
@@ -212,7 +212,7 @@
config FB_RETINAZ3
tristate "Amiga Retina Z3 support"
- depends on FB && ZORRO && BROKEN
+ depends on (FB = y) && ZORRO && BROKEN
help
This enables support for the Retina Z3 graphics card. Say N unless
you have a Retina Z3 or plan to get one before you next recompile
@@ -220,67 +220,67 @@
config FB_FM2
bool "Amiga FrameMaster II/Rainbow II support"
- depends on FB && ZORRO
+ depends on (FB = y) && ZORRO
help
This is the frame buffer device driver for the Amiga FrameMaster
card from BSC (exhibited 1992 but not shipped as a CBM product).
config FB_ATARI
bool "Atari native chipset support"
- depends on FB && ATARI && BROKEN
+ depends on (FB = y) && ATARI && BROKEN
help
This is the frame buffer device driver for the builtin graphics
chipset found in Ataris.
config FB_OF
bool "Open Firmware frame buffer device support"
- depends on FB && (PPC64 || PPC_OF)
+ depends on (FB = y) && (PPC64 || PPC_OF)
help
Say Y if you want support with Open Firmware for your graphics
board.
config FB_CONTROL
bool "Apple \"control\" display support"
- depends on FB && PPC_PMAC
+ depends on (FB = y) && PPC_PMAC
help
This driver supports a frame buffer for the graphics adapter in the
Power Macintosh 7300 and others.
config FB_PLATINUM
bool "Apple \"platinum\" display support"
- depends on FB && PPC_PMAC
+ depends on (FB = y) && PPC_PMAC
help
This driver supports a frame buffer for the "platinum" graphics
adapter in some Power Macintoshes.
config FB_VALKYRIE
bool "Apple \"valkyrie\" display support"
- depends on FB && (MAC || PPC_PMAC)
+ depends on (FB = y) && (MAC || PPC_PMAC)
help
This driver supports a frame buffer for the "valkyrie" graphics
adapter in some Power Macintoshes.
config FB_CT65550
bool "Chips 65550 display support"
- depends on FB && PPC
+ depends on (FB = y) && PPC
help
This is the frame buffer device driver for the Chips & Technologies
65550 graphics chip in PowerBooks.
config FB_ASILIANT
bool "Chips 69000 display support"
- depends on FB && PCI
+ depends on (FB = y) && PCI
config FB_IMSTT
bool "IMS Twin Turbo display support"
- depends on FB && PCI
+ depends on (FB = y) && PCI
help
The IMS Twin Turbo is a PCI-based frame buffer card bundled with
many Macintosh and compatible computers.
config FB_S3TRIO
bool "S3 Trio display support"
- depends on FB && PPC && BROKEN
+ depends on (FB = y) && PPC && BROKEN
help
If you have a S3 Trio say Y. Say N for S3 Virge.
@@ -313,12 +313,12 @@
config FB_MAC
bool "Generic Macintosh display support"
- depends on FB && MAC
+ depends on (FB = y) && MAC
# bool ' Apple DAFB display support' CONFIG_FB_DAFB
config FB_HP300
bool
- depends on FB && HP300
+ depends on (FB = y) && HP300
default y
config FB_TGA
@@ -330,7 +330,7 @@
config FB_VESA
bool "VESA VGA graphics support"
- depends on FB && (X86 || X86_64)
+ depends on (FB = y) && (X86 || X86_64)
help
This is the frame buffer device driver for generic VESA 2.0
compliant graphic cards. The older VESA 1.2 cards are not supported.
@@ -364,7 +364,7 @@
config VIDEO_SELECT
bool
- depends on FB && X86
+ depends on (FB = y) && X86
default y
config FB_SGIVW
@@ -375,7 +375,7 @@
config FB_GBE
bool "SGI Graphics Backend frame buffer support"
- depends on FB && (SGI_IP32 || X86_VISWS)
+ depends on (FB = y) && (SGI_IP32 || X86_VISWS)
help
This is the frame buffer device driver for SGI Graphics Backend.
This chip is used in SGI O2 and Visual Workstation 320/540.
@@ -390,28 +390,28 @@
config BUS_I2C
bool
- depends on FB && VISWS
+ depends on (FB = y) && VISWS
default y
config FB_SUN3
bool "Sun3 framebuffer support"
- depends on FB && (SUN3 || SUN3X) && BROKEN
+ depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
config FB_BW2
bool "BWtwo support"
- depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
help
This is the frame buffer device driver for the BWtwo frame buffer.
config FB_CG3
bool "CGthree support"
- depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
help
This is the frame buffer device driver for the CGthree frame buffer.
config FB_CG6
bool "CGsix (GX,TurboGX) support"
- depends on FB && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
help
This is the frame buffer device driver for the CGsix (GX, TurboGX)
frame buffer.
@@ -436,7 +436,7 @@
config FB_EPSON1355
bool "Epson 1355 framebuffer support"
- depends on FB && (SUPERH || ARCH_CEIVA)
+ depends on (FB = y) && (SUPERH || ARCH_CEIVA)
help
Build in support for the SED1355 Epson Research Embedded RAMDAC
LCD/CRT Controller (since redesignated as the S1D13505) as a
@@ -541,6 +541,7 @@
config FB_MATROX
tristate "Matrox acceleration"
depends on FB && PCI
+ select FB_TILEBLITTING
---help---
Say Y here if you have a Matrox Millennium, Matrox Millennium II,
Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox
@@ -953,11 +954,11 @@
config FB_AU1100
bool "Au1100 LCD Driver"
- depends on FB && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
+ depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
config FB_SBUS
bool "SBUS and UPA framebuffers"
- depends on FB && (SPARC32 || SPARC64)
+ depends on (FB = y) && (SPARC32 || SPARC64)
help
Say Y if you want support for SBUS or UPA based frame buffer device.
@@ -998,7 +999,7 @@
config FB_PCI
bool "PCI framebuffers"
- depends on FB && PCI && (SPARC64 || SPARC32)
+ depends on (FB = y) && PCI && (SPARC64 || SPARC32)
config FB_IGA
bool "IGA 168x display support"
@@ -1016,21 +1017,21 @@
config FB_PMAG_AA
bool "PMAG-AA TURBOchannel framebuffer support"
- depends on FB && MACH_DECSTATION && TC
+ depends on (FB = y) && MACH_DECSTATION && TC
help
Support for the PMAG-AA TURBOchannel framebuffer card (1280x1024x1)
used mainly in the MIPS-based DECstation series.
config FB_PMAG_BA
bool "PMAG-BA TURBOchannel framebuffer support"
- depends on FB && MACH_DECSTATION && TC
+ depends on (FB = y) && MACH_DECSTATION && TC
help
Support for the PMAG-BA TURBOchannel framebuffer card (1024x864x8)
used mainly in the MIPS-based DECstation series.
config FB_PMAGB_B
bool "PMAGB-B TURBOchannel framebuffer support"
- depends on FB && MACH_DECSTATION && TC
+ depends on (FB = y) && MACH_DECSTATION && TC
help
Support for the PMAGB-B TURBOchannel framebuffer card used mainly
in the MIPS-based DECstation series. The card is currently only
@@ -1038,7 +1039,7 @@
config FB_MAXINE
bool "Maxine (Personal DECstation) onboard framebuffer support"
- depends on FB && MACH_DECSTATION && TC
+ depends on (FB = y) && MACH_DECSTATION && TC
help
Support for the onboard framebuffer (1024x768x8) in the Personal
DECstation series (Personal DECstation 5000/20, /25, /33, /50,
@@ -1046,7 +1047,7 @@
config FB_TX3912
bool "TMPTX3912/PR31700 frame buffer support"
- depends on FB && NINO
+ depends on (FB = y) && NINO
help
The TX3912 is a Toshiba RISC processor based on the MIPS 3900 core
see .
diff -Nru a/drivers/video/Makefile b/drivers/video/Makefile
--- a/drivers/video/Makefile 2005-03-07 14:08:41 -05:00
+++ b/drivers/video/Makefile 2005-03-07 14:08:41 -05:00
@@ -8,11 +8,9 @@
obj-$(CONFIG_LOGO) += logo/
obj-$(CONFIG_SYSFS) += backlight/
-obj-$(CONFIG_FB) += fbmem.o fbmon.o fbcmap.o fbsysfs.o modedb.o softcursor.o
-# Only include macmodes.o if we have FB support and are PPC
-ifeq ($(CONFIG_FB),y)
-obj-$(CONFIG_PPC) += macmodes.o
-endif
+obj-$(CONFIG_FB) += fb.o
+fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o modedb.o softcursor.o
+fb-objs := $(fb-y)
# Hardware specific drivers go first
obj-$(CONFIG_FB_RETINAZ3) += retz3fb.o
diff -Nru a/drivers/video/console/Makefile b/drivers/video/console/Makefile
--- a/drivers/video/console/Makefile 2005-03-07 14:08:41 -05:00
+++ b/drivers/video/console/Makefile 2005-03-07 14:08:41 -05:00
@@ -25,7 +25,9 @@
obj-$(CONFIG_VGA_CONSOLE) += vgacon.o
obj-$(CONFIG_MDA_CONSOLE) += mdacon.o
obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o font.o
-obj-$(CONFIG_FB_TILEBLITTING) += tileblit.o
+ifeq ($(CONFIG_FB_TILEBLITTING),y)
+obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += tileblit.o
+endif
obj-$(CONFIG_FB_STI) += sticore.o
diff -Nru a/drivers/video/fbmem.c b/drivers/video/fbmem.c
--- a/drivers/video/fbmem.c 2005-03-07 14:08:41 -05:00
+++ b/drivers/video/fbmem.c 2005-03-07 14:08:41 -05:00
@@ -1204,7 +1204,22 @@
}
return 0;
}
+
+void __exit
+fbmem_exit(void)
+{
+ class_simple_destroy(fb_class);
+}
+
+#ifdef MODULE
+module_init(fbmem_init);
+module_exit(fbmem_exit);
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Framebuffer base");
+#else
subsys_initcall(fbmem_init);
+subsys_exitcall(fbmem_exit);
+#endif
static char *video_options[FB_MAX];
static int ofonly;