Commit 67bf3c24 authored by David S. Miller's avatar David S. Miller

[FRAMEBUFFER]: Convert cg14 driver to new APIs.

parent 57b55f79
...@@ -823,9 +823,9 @@ config FB_TCX ...@@ -823,9 +823,9 @@ config FB_TCX
This is the frame buffer device driver for the TCX 24/8bit frame This is the frame buffer device driver for the TCX 24/8bit frame
buffer. buffer.
config FB_CGFOURTEEN config FB_CG14
bool "CGfourteen (SX) support" bool "CGfourteen (SX) support"
depends on FB_SBUS && SPARC32 depends on FB_SBUS
help help
This is the frame buffer device driver for the CGfourteen frame This is the frame buffer device driver for the CGfourteen frame
buffer on Desktop SPARCsystems with the SX graphics option. buffer on Desktop SPARCsystems with the SX graphics option.
......
...@@ -72,7 +72,6 @@ obj-$(CONFIG_FB_VOODOO1) += sstfb.o cfbfillrect.o cfbcopyarea.o cfbimgb ...@@ -72,7 +72,6 @@ obj-$(CONFIG_FB_VOODOO1) += sstfb.o cfbfillrect.o cfbcopyarea.o cfbimgb
# One by one these are being converted over to the new APIs # One by one these are being converted over to the new APIs
#obj-$(CONFIG_FB_TCX) += tcxfb.o sbusfb.o #obj-$(CONFIG_FB_TCX) += tcxfb.o sbusfb.o
#obj-$(CONFIG_FB_CGFOURTEEN) += cgfourteenfb.o sbusfb.o
#obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o #obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o
#obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o #obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o
...@@ -82,6 +81,8 @@ obj-$(CONFIG_FB_CG3) += cg3.o sbuslib.o cfbimgblt.o cfbcopyarea.o ...@@ -82,6 +81,8 @@ obj-$(CONFIG_FB_CG3) += cg3.o sbuslib.o cfbimgblt.o cfbcopyarea.o
cfbfillrect.o cfbfillrect.o
obj-$(CONFIG_FB_BW2) += bw2.o sbuslib.o cfbimgblt.o cfbcopyarea.o \ obj-$(CONFIG_FB_BW2) += bw2.o sbuslib.o cfbimgblt.o cfbcopyarea.o \
cfbfillrect.o cfbfillrect.o
obj-$(CONFIG_FB_CG14) += cg14.o sbuslib.o cfbimgblt.o cfbcopyarea.o \
cfbfillrect.o
# Files generated that shall be removed upon make clean # Files generated that shall be removed upon make clean
clean-files := promcon_tbl.c clean-files := promcon_tbl.c
......
...@@ -152,6 +152,8 @@ extern int cg3_init(void); ...@@ -152,6 +152,8 @@ extern int cg3_init(void);
extern int cg3_setup(char*); extern int cg3_setup(char*);
extern int bw2_init(void); extern int bw2_init(void);
extern int bw2_setup(char*); extern int bw2_setup(char*);
extern int cg14_init(void);
extern int cg14_setup(char*);
static struct { static struct {
const char *name; const char *name;
...@@ -255,6 +257,9 @@ static struct { ...@@ -255,6 +257,9 @@ static struct {
#ifdef CONFIG_FB_BW2 #ifdef CONFIG_FB_BW2
{ "bw2", bw2_init, bw2_setup }, { "bw2", bw2_init, bw2_setup },
#endif #endif
#ifdef CONFIG_FB_CG14
{ "cg14", cg14_init, cg14_setup },
#endif
/* /*
* Generic drivers that are used as fallbacks * Generic drivers that are used as fallbacks
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment