CVS Update: 2.6 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.6
Repository:	2.6/sound/isa/cs423x/
Changes by:	zi...@sc....(none)	04/09/25 14:09:59

Log message:
  conflict fixes from import of 2.6.8

Modified files:
      ./:
        Makefile 
      2.6/arch/ppc/:
        Makefile defconfig 
      2.6/arch/ppc/configs/:
        apus_defconfig 
      2.6/arch/ppc/kernel/:
        Makefile entry.S head.S misc.S ppc_ksyms.c setup.c time.c 
      2.6/arch/ppc/mm/:
        Makefile init.c pgtable.c 
      2.6/include/asm-ppc/:
        io.h machdep.h pgtable.h 
      2.6/include/video/:
        vga.h 
Added files:
      2.6/arch/mips/pmc-sierra/yosemite/:
        i2c-yosemite.c 
Removed files:
      2.6/Documentation/:
        as-iosched.txt 
      2.6/Documentation/i2c/:
        i2c-pport i2c-velleman 
      2.6/arch/arm/boot/compressed/:
        head-ftvpci.S 
      2.6/arch/arm/common/:
        platform.c plx90x0.c 
      2.6/arch/arm/configs/:
        adi_evb_defconfig 
      2.6/arch/arm/kernel/:
        time-acorn.c 
      2.6/arch/arm/mach-adifcc/:
        Makefile arch.c irq.c mm.c 
      2.6/arch/arm/mach-ftvpci/:
        Makefile core.c leds.c pci.c 
      2.6/arch/arm/mach-lh7a40x/:
        fiq.S ide-lpd7a40x.c 
      2.6/arch/arm/mach-tbox/:
        Makefile core.c 
      2.6/arch/i386/boot98/:
        Makefile bootsect.S install.sh mtools.conf.in setup.S 
        video.S 
      2.6/arch/i386/boot98/compressed/:
        Makefile head.S misc.c vmlinux.scr 
      2.6/arch/i386/boot98/tools/:
        build.c 
      2.6/arch/i386/kernel/:
        std_resources.c 
      2.6/arch/i386/mach-pc9800/:
        Makefile setup.c std_resources.c topology.c 
      2.6/arch/mips/configs/:
        eagle_defconfig 
      2.6/arch/mips/mm/:
        tlbex-r3k.S 
      2.6/arch/mips/mm-32/:
        Makefile tlbex-r4k.S 
      2.6/arch/mips/mm-64/:
        Makefile tlb-dbg-r4k.c tlb-glue-r4k.S tlb-glue-sb1.S 
        tlbex-r4k.S 
      2.6/arch/mips/momentum/ocelot_c/:
        pci-irq.c 
      2.6/arch/mips/momentum/ocelot_g/:
        gt64240.h gt64240_dep.h pci-irq.c 
      2.6/arch/mips/pci/:
        fixup-eagle.c fixup-mv64340.c fixup-tb0229.c 
        fixup-victor-mpc30x.c ops-mv64340.c ops-vrc4173.c 
      2.6/arch/mips/vr41xx/nec-eagle/:
        Makefile irq.c setup.c 
      2.6/arch/mips/vr41xx/tanbac-tb0229/:
        reboot.c 
      2.6/arch/ppc/8260_io/:
        commproc.c uart.c 
      2.6/arch/ppc/kernel/:
        pci-dma.c 
      2.6/arch/ppc/platforms/:
        error_log.c error_log.h proc_rtas.c rpxsuper.h 
      2.6/arch/ppc/syslib/:
        ppc8260_pic.c ppc8260_pic.h 
      2.6/arch/sh/boards/systemh/:
        Makefile io.c irq.c setup.c 
      2.6/arch/sparc64/lib/:
        blockops.S 
      2.6/drivers/block/:
        carmel.c floppy98.c 
      2.6/drivers/char/:
        h8.c h8.h lp_old98.c sn_serial.c upd4990a.c 
      2.6/drivers/ide/legacy/:
        hd98.c pc9800.c 
      2.6/drivers/input/keyboard/:
        98kbd.c 
      2.6/drivers/input/misc/:
        98spkr.c 
      2.6/drivers/input/mouse/:
        98busmouse.c 
      2.6/drivers/input/serio/:
        98kbd-io.c 
      2.6/drivers/mtd/nand/:
        nand.c 
      2.6/drivers/net/:
        ne2k_cbus.c ne2k_cbus.h 
      2.6/drivers/s390/cio/:
        requestirq.c 
      2.6/drivers/scsi/:
        pc980155.c pc980155.h scsi_pc98.c 
      2.6/drivers/scsi/qla2xxx/:
        qla_os.h 
      2.6/drivers/serial/:
        8250_hcdp.c 8250_hcdp.h serial98.c 
      2.6/drivers/usb/media/:
        w9968cf_externaldef.h 
      2.6/fs/partitions/:
        nec98.c nec98.h 
      2.6/include/asm-alpha/:
        cpumask.h init.h 
      2.6/include/asm-arm/:
        cpumask.h 
      2.6/include/asm-arm/arch-adifcc/:
        adi_evb.h dma.h hardware.h io.h irqs.h memory.h param.h 
        serial.h system.h time.h timex.h uncompress.h vmalloc.h 
      2.6/include/asm-arm/arch-cl7500/:
        time.h 
      2.6/include/asm-arm/arch-ebsa110/:
        time.h 
      2.6/include/asm-arm/arch-ebsa285/:
        time.h 
      2.6/include/asm-arm/arch-epxa10db/:
        time.h 
      2.6/include/asm-arm/arch-iop3xx/:
        time.h 
      2.6/include/asm-arm/arch-ixp4xx/:
        time.h 
      2.6/include/asm-arm/arch-lh7a40x/:
        ide.h time.h 
      2.6/include/asm-arm/arch-nexuspci/:
        dma.h hardware.h io.h irqs.h memory.h param.h system.h 
        time.h timex.h uncompress.h vmalloc.h 
      2.6/include/asm-arm/arch-omap/:
        time.h 
      2.6/include/asm-arm/arch-pxa/:
        time.h 
      2.6/include/asm-arm/arch-rpc/:
        time.h 
      2.6/include/asm-arm/arch-s3c2410/:
        time.h 
      2.6/include/asm-arm/arch-sa1100/:
        time.h 
      2.6/include/asm-arm/arch-shark/:
        time.h 
      2.6/include/asm-arm/arch-tbox/:
        dma.h hardware.h io.h irqs.h memory.h param.h serial.h 
        system.h time.h timex.h uncompress.h vmalloc.h 
      2.6/include/asm-arm/arch-versatile/:
        time.h 
      2.6/include/asm-arm26/:
        cpumask.h 
      2.6/include/asm-cris/:
        cpumask.h 
      2.6/include/asm-generic/:
        cpumask.h cpumask_arith.h cpumask_array.h 
        cpumask_const_reference.h cpumask_const_value.h 
        cpumask_up.h 
      2.6/include/asm-h8300/:
        cpumask.h h8300_ne.h init.h 
      2.6/include/asm-i386/:
        cpumask.h init.h pc9800.h pc9800_sca.h std_resources.h 
        upd4990a.h 
      2.6/include/asm-i386/mach-pc9800/:
        apm.h bios_ebda.h do_timer.h io_ports.h irq_vectors.h 
        mach_reboot.h mach_time.h mach_timer.h mach_traps.h 
        mach_wakecpu.h pci-functions.h setup_arch_post.h 
        setup_arch_pre.h smpboot_hooks.h 
      2.6/include/asm-ia64/:
        cpumask.h 
      2.6/include/asm-m68k/:
        cpumask.h init.h 
      2.6/include/asm-m68knommu/:
        cpumask.h init.h 
      2.6/include/asm-mips/:
        cpumask.h init.h 
      2.6/include/asm-mips/vr41xx/:
        eagle.h tb0229.h 
      2.6/include/asm-parisc/:
        cpumask.h 
      2.6/include/asm-ppc/:
        cpm_8260.h cpumask.h immap_8260.h ppc405_dma.h 
      2.6/include/asm-ppc64/:
        cpumask.h init.h 
      2.6/include/asm-s390/:
        cpumask.h init.h 
      2.6/include/asm-sh/:
        cpumask.h init.h 
      2.6/include/asm-sparc/:
        cpumask.h init.h 
      2.6/include/asm-sparc64/:
        cpumask.h init.h 
      2.6/include/asm-um/:
        cpumask.h init.h 
      2.6/include/asm-v850/:
        cpumask.h 
      2.6/include/asm-x86_64/:
        cpumask.h init.h 
      2.6/include/linux/:
        802_11.h acpi_serial.h adb_mouse.h atapi.h fsfilter.h 
        in_systm.h isdn_lzscomp.h mpp.h netbeui.h netfilter_ddp.h 
        netfilter_ipx.h netfilter_x25.h upd4990a.h 
      2.6/net/irda/:
        crc.c 
      2.6/net/sched/:
        sch_csz.c sch_delay.c 
      2.6/net/xfrm/:
        xfrm_output.c 
      2.6/scripts/:
        empty.c file2alias.c mk_elfconfig.c mkconfigs mkspec 
        modpost.c modpost.h sumversion.c 
      2.6/sound/isa/cs423x/:
        pc98.c pc9801_118_magic.h sound_pc9800.h 
  
  Revision      Changes    Path
  1.10          +92 -72    2.6/Makefile
  1.4           +37 -10    2.6/arch/ppc/Makefile
  1.9           +32 -11    2.6/arch/ppc/defconfig
  1.9           +32 -11    2.6/arch/ppc/configs/apus_defconfig
  1.6           +1 -7      2.6/arch/ppc/kernel/Makefile
  1.6           +24 -12    2.6/arch/ppc/kernel/entry.S
  1.8           +3 -3      2.6/arch/ppc/kernel/head.S
  1.8           +55 -3     2.6/arch/ppc/kernel/misc.S
  1.8           +5 -4      2.6/arch/ppc/kernel/ppc_ksyms.c
  1.7           +58 -4     2.6/arch/ppc/kernel/setup.c
  1.4           +15 -7     2.6/arch/ppc/kernel/time.c
  1.5           +1 -4      2.6/arch/ppc/mm/Makefile
  1.5           +7 -1      2.6/arch/ppc/mm/init.c
  1.7           +32 -0     2.6/arch/ppc/mm/pgtable.c
  1.8           +17 -2     2.6/include/asm-ppc/io.h
  1.6           +2 -1      2.6/include/asm-ppc/machdep.h
  1.6           +37 -0     2.6/include/asm-ppc/pgtable.h
  1.3           +7 -1      2.6/include/video/vga.h