[Gc-linux-cvs] linux/arch/ppc/boot/simple Makefile,1.17,1.18

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

Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10335/arch/ppc/boot/simple

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/arch/ppc/boot/simple/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	21 Jun 2006 18:56:05 -0000	1.17
+++ Makefile	30 Apr 2007 17:06:11 -0000	1.18
@@ -116,10 +116,6 @@
      extra.o-$(CONFIG_CHESTNUT)		:= misc-chestnut.o
          end-$(CONFIG_CHESTNUT)		:= chestnut
 
-      zimage-$(CONFIG_GEMINI)		:= zImage-STRIPELF
-zimageinitrd-$(CONFIG_GEMINI)		:= zImage.initrd-STRIPELF
-         end-$(CONFIG_GEMINI)		:= gemini
-
      extra.o-$(CONFIG_KATANA)		:= misc-katana.o
          end-$(CONFIG_KATANA)		:= katana
    cacheflag-$(CONFIG_KATANA)		:= -include $(clear_L2_L3)