CVS Update: 2.6 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.6
Repository:	2.6/include/asm-sh/
Changes by:	zi...@sc....(none)	04/02/04 16:56:03

Log message:
  conflict fixes from import of 2.6.2

Modified files:
      ./:
        Makefile 
      2.6/arch/ppc/kernel/:
        Makefile misc.S ppc_ksyms.c setup.c 
      2.6/arch/ppc/mm/:
        Makefile 
      2.6/include/asm-ppc/:
        pgtable.h 
Removed files:
      2.6/Documentation/video4linux/bttv/:
        CARDLIST 
      2.6/arch/arm/configs/:
        cerfpda_defconfig cerfpod_defconfig 
      2.6/arch/cris/mm/:
        extable.c 
      2.6/arch/h8300/mm/:
        extable.c 
      2.6/arch/ia64/scripts/:
        unwcheck.sh 
      2.6/arch/ia64/sn/io/:
        sgi_if.c sgi_io_sim.c 
      2.6/arch/ia64/sn/io/platform_init/:
        irix_io_init.c 
      2.6/arch/m68k/mm/:
        extable.c 
      2.6/arch/m68knommu/mm/:
        extable.c 
      2.6/arch/mips/mm/:
        extable.c 
      2.6/arch/parisc/mm/:
        extable.c 
      2.6/arch/ppc/mm/:
        extable.c 
      2.6/arch/ppc/platforms/:
        mpc82xx.h 
      2.6/arch/ppc64/kernel/:
        htab.c 
      2.6/arch/ppc64/mm/:
        extable.c 
      2.6/arch/s390/mm/:
        extable.c 
      2.6/arch/sh/boards/adx/:
        io.c mach.c 
      2.6/arch/sh/boards/bigsur/:
        mach.c pci.c 
      2.6/arch/sh/boards/cat68701/:
        io.c mach.c 
      2.6/arch/sh/boards/cqreek/:
        io.c mach.c 
      2.6/arch/sh/boards/dreamcast/:
        io.c mach.c pci.c 
      2.6/arch/sh/boards/ec3104/:
        mach.c 
      2.6/arch/sh/boards/mpc1211/:
        io.c mach.c 
      2.6/arch/sh/boards/saturn/:
        mach.c 
      2.6/arch/sh/boards/sh2000/:
        io.c mach.c 
      2.6/arch/sh/kernel/:
        dma.c fpu.c pci-dma.c pci.c pci_auto.c pcibios.c rtc.c 
      2.6/arch/sh/kernel/cpu/:
        dma.c 
      2.6/arch/sh/kernel/cpu/sh4/:
        pci-sh7751.c pci-st40.c pci-st40.h 
      2.6/arch/sh/mm/:
        __clear_user_page-sh4.S __copy_user_page-sh4.S 
      2.6/drivers/ide/ppc/:
        Makefile 
      2.6/drivers/isdn/eicon/:
        Divas_mod.c Kconfig Makefile adapter.h bri.c common.c 
        constant.h divalog.h divas.h dsp_defs.h dspdids.h eicon.h 
        eicon_dsp.h eicon_idi.c eicon_idi.h eicon_io.c 
        eicon_isa.c eicon_isa.h eicon_mod.c eicon_pci.c 
        eicon_pci.h fourbri.c fpga.c idi.c idi.h kprintf.c 
        lincfg.c linchr.c linio.c linsys.c log.c pc.h pc_maint.h 
        pr_pc.h pri.c sys.h uxio.h xlog.c 
      2.6/drivers/net/:
        68360enet.c 
      2.6/drivers/s390/char/:
        tuball.c tubfs.c tubio.h tubtty.c tubttyaid.c tubttybld.c 
        tubttyrcl.c tubttyscl.c tubttysiz.c 
      2.6/fs/xfs/:
        xfs_buf.h xfsidbg.c 
      2.6/fs/xfs/linux/:
        xfs_behavior.c xfs_behavior.h xfs_iomap.c 
      2.6/fs/xfs/pagebuf/:
        page_buf.c page_buf.h page_buf_internal.h 
        page_buf_locking.c page_buf_trace.h 
      2.6/fs/xfs/support/:
        kmem.h mrlock.c mrlock.h mutex.h sema.h spin.h sv.h 
        time.h 
      2.6/include/asm-ia64/:
        machvec_sn1.h 
      2.6/include/asm-ia64/sn/:
        invent.h nag.h 
      2.6/include/asm-ia64/sn/arc/:
        hinv.h types.h 
      2.6/include/asm-ppc64/iSeries/:
        mf_proc.h veth-proc.h 
      2.6/include/asm-sh/:
        bigsur.h dc_sysasic.h ec3104.h hd64461.h hd64465.h 
        hd64465_gpio.h hitachi_7751se.h hitachi_se.h io_7751se.h 
        io_adx.h io_bigsur.h io_cat68701.h io_dc.h io_ec3104.h 
        io_generic.h io_hd64461.h io_hd64465.h io_se.h 
        io_sh2000.h io_unknown.h keyboard-ec3104.h pci-sh7751.h 
        serial-bigsur.h serial-ec3104.h smc37c93x.h 
  
  Revision      Changes    Path
  1.4           +12 -7     2.6/Makefile
  1.3           +1 -2      2.6/arch/ppc/kernel/Makefile
  1.3           +1 -0      2.6/arch/ppc/kernel/misc.S
  1.4           +16 -16    2.6/arch/ppc/kernel/ppc_ksyms.c
  1.3           +0 -1      2.6/arch/ppc/kernel/setup.c
  1.3           +1 -1      2.6/arch/ppc/mm/Makefile
  1.3           +9 -0      2.6/include/asm-ppc/pgtable.h