diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/video/Makefile | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/video/Makefile')
-rw-r--r-- | drivers/video/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 5343be151..5c049664a 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -79,6 +79,11 @@ else endif endif +ifeq ($(CONFIG_FB_PM2),y) +L_OBJS += pm2fb.o +CONFIG_FBGEN_BUILTIN = y +endif + ifeq ($(CONFIG_FB_APOLLO),y) L_OBJS += dnfb.o endif @@ -123,11 +128,6 @@ else endif endif -ifeq ($(CONFIG_FB_CVPPC),y) -L_OBJS += cvppcfb.o -CONFIG_FBGEN_BUILTIN = y -endif - ifeq ($(CONFIG_FB_MAC),y) L_OBJS += macfb.o endif |