CVS Update: 2.3 (branch: trunk)

[Roman Z. <zi...@us...>]

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/include/asm-ppc/
Changes by:	zippel@usw-pr-cvs1.	01/05/18 16:18:48

Log message:
  conflict fixes from import bitkeeper (2.4.5-pre3)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        Makefile 
      2.3/arch/ppc/kernel/:
        apus_setup.c head.S irq.c pci.c ppc-stub.c ppc_ksyms.c 
        setup.c time.c 
      2.3/arch/ppc/mm/:
        init.c 
      2.3/drivers/char/:
        Makefile mem.c 
      2.3/drivers/net/:
        Makefile 
      2.3/drivers/scsi/:
        Makefile 
      2.3/include/asm-ppc/:
        amigaints.h bootinfo.h io.h mpc8xx.h pgtable.h ppc4xx.h 
Removed files:
      2.3/drivers/net/pcmcia/:
        hermes.c hermes.h orinoco_cs.c 
      2.3/drivers/net/tokenring/:
        ibmtr.h 
      2.3/fs/proc/:
        procfs_syms.c 
  
  Revision      Changes    Path
  1.21          +3 -4      2.3/Makefile
  1.13          +14 -26    2.3/Documentation/Configure.help
  1.5           +4 -41     2.3/arch/ppc/Makefile
  1.14          +3 -0      2.3/arch/ppc/kernel/apus_setup.c
  1.18          +3 -4      2.3/arch/ppc/kernel/head.S
  1.7           +3 -2      2.3/arch/ppc/kernel/irq.c
  1.10          +149 -6    2.3/arch/ppc/kernel/pci.c
  1.5           +4 -1      2.3/arch/ppc/kernel/ppc-stub.c
  1.19          +9 -8      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.13          +3 -1      2.3/arch/ppc/kernel/setup.c
  1.10          +10 -1     2.3/arch/ppc/kernel/time.c
  1.17          +3 -2      2.3/arch/ppc/mm/init.c
  1.13          +1 -1      2.3/drivers/char/Makefile
  1.5           +2 -0      2.3/drivers/char/mem.c
  1.7           +3 -1      2.3/drivers/net/Makefile
  1.5           +9 -0      2.3/drivers/scsi/Makefile
  1.4           +3 -0      2.3/include/asm-ppc/amigaints.h
  1.4           +3 -0      2.3/include/asm-ppc/bootinfo.h
  1.7           +7 -3      2.3/include/asm-ppc/io.h
  1.2           +21 -4     2.3/include/asm-ppc/mpc8xx.h
  1.7           +8 -5      2.3/include/asm-ppc/pgtable.h
  1.2           +3 -2      2.3/include/asm-ppc/ppc4xx.h