[Gc-linux-cvs] linux/drivers Makefile,1.19,1.20

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10335/drivers

Modified Files:
	Makefile 
Log Message:
Merged 2.6.21.
Updated sound driver to use in_be* and out_be* instead of read* and write*
input/output instructions. The rest of the kernel code will be changed
accordingly before support for the powerpc branch is merged.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	19 Feb 2007 23:06:51 -0000	1.19
+++ Makefile	30 Apr 2007 17:06:12 -0000	1.20
@@ -30,7 +30,7 @@
 obj-y				+= base/ block/ misc/ mfd/ net/ media/
 obj-$(CONFIG_NUBUS)		+= nubus/
 obj-$(CONFIG_ATM)		+= atm/
-obj-$(CONFIG_PPC_PMAC)		+= macintosh/
+obj-y				+= macintosh/
 obj-$(CONFIG_IDE)		+= ide/
 obj-$(CONFIG_FC4)		+= fc4/
 obj-$(CONFIG_SCSI)		+= scsi/
@@ -38,6 +38,7 @@
 obj-$(CONFIG_FUSION)		+= message/
 obj-$(CONFIG_IEEE1394)		+= ieee1394/
 obj-y				+= cdrom/
+obj-y				+= auxdisplay/
 obj-$(CONFIG_MTD)		+= mtd/
 obj-$(CONFIG_SPI)		+= spi/
 obj-$(CONFIG_PCCARD)		+= pcmcia/