Update of /cvsroot/gc-linux/linux/drivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/drivers
Modified Files:
Makefile
Log Message:
Merge 2.6.10
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 19 Oct 2004 09:46:09 -0000 1.5
+++ Makefile 4 Jan 2005 21:39:13 -0000 1.6
@@ -17,8 +17,9 @@
# default.
obj-y += char/
-# i810fb depends on char/agp/
+# i810fb and intelfb depend on char/agp/
obj-$(CONFIG_FB_I810) += video/i810/
+obj-$(CONFIG_FB_INTEL) += video/intelfb/
# we also need input/serio early so serio bus is initialized by the time
# serial drivers start registering their serio ports
@@ -36,7 +37,7 @@
obj-$(CONFIG_IEEE1394) += ieee1394/
obj-y += cdrom/
obj-$(CONFIG_MTD) += mtd/
-obj-$(CONFIG_PCMCIA) += pcmcia/
+obj-$(CONFIG_PCCARD) += pcmcia/
obj-$(CONFIG_DIO) += dio/
obj-$(CONFIG_SBUS) += sbus/
obj-$(CONFIG_ZORRO) += zorro/
|
