CVS Update: 2.6 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.6
Repository:	2.6/sound/oss/
Changes by:	zi...@sc....(none)	04/05/24 14:36:54

Log message:
  conflict fixes from import of 2.6.6

Modified files:
      ./:
        Makefile 
      2.6/arch/ppc/:
        defconfig 
      2.6/arch/ppc/configs/:
        apus_defconfig 
      2.6/arch/ppc/kernel/:
        head.S misc.S 
      2.6/arch/ppc/mm/:
        pgtable.c 
Added files:
      2.6/arch/mips/pci/:
        pci-lasat.c 
Removed files:
      2.6/Documentation/DocBook/:
        parport-multi.fig parport-share.fig parport-structure.fig 
        parportbook.tmpl 
      2.6/arch/arm/common/:
        sa1111-pcibuf.c 
      2.6/arch/arm/configs/:
        anakin_defconfig 
      2.6/arch/arm/mm/:
        fault-common.c 
      2.6/arch/ia64/kernel/:
        efivars.c 
      2.6/arch/mips/:
        jaguar-atx_defconfig 
      2.6/arch/mips/configs/:
        hp-lj_defconfig 
      2.6/arch/mips/lasat/:
        pci.c 
      2.6/arch/mips/momentum/jaguar_atx/:
        mv-irq.c pci-irq.c pci.c 
      2.6/arch/mips/momentum/ocelot_c/:
        mv-irq.c 
      2.6/arch/mips/pmc-sierra/yosemite/:
        i2c-yosemite.c 
      2.6/arch/mips/sgi-ip27/:
        ip27-setup.c 
      2.6/arch/mips/sgi-ip32/:
        ip32-timer.c 
      2.6/arch/mips/vr41xx/casio-e55/:
        init.c 
      2.6/arch/mips/vr41xx/ibm-workpad/:
        init.c 
      2.6/arch/mips/vr41xx/nec-eagle/:
        init.c 
      2.6/arch/mips/vr41xx/tanbac-tb0226/:
        init.c 
      2.6/arch/mips/vr41xx/tanbac-tb0229/:
        init.c 
      2.6/arch/mips/vr41xx/victor-mpc30x/:
        init.c 
      2.6/arch/mips/vr41xx/zao-capcella/:
        init.c 
      2.6/arch/ppc/platforms/:
        k2_pci.c k2_setup.c mcpn765_pci.c mcpn765_setup.c 
        pcore_pci.c pcore_setup.c prpmc750_pci.c prpmc750_setup.c 
        prpmc800_pci.c prpmc800_setup.c 
      2.6/arch/ppc/syslib/:
        pplus_common.c 
      2.6/arch/ppc64/oprofile/:
        init.c 
      2.6/arch/x86_64/kernel/mtrr/:
        Makefile 
      2.6/drivers/char/ipmi/:
        ipmi_kcs_intf.c ipmi_kcs_sm.h 
      2.6/drivers/char/watchdog/:
        amd7xx_tco.c 
      2.6/drivers/net/:
        sis190.c 
      2.6/drivers/net/tulip/:
        ChangeLog 
      2.6/drivers/net/wan/lmc/:
        lmc_proto_raw.h lmc_ver.h 
      2.6/drivers/s390/net/:
        qeth.c 
      2.6/drivers/serial/:
        amba.c 
      2.6/fs/hfs/:
        COPYING 
      2.6/fs/msdos/:
        msdosfs_syms.c 
      2.6/fs/ntfs/:
        time.c 
      2.6/fs/vfat/:
        vfatfs_syms.c 
      2.6/include/asm-arm/hardware/:
        serial_amba.h 
      2.6/include/asm-i386/mach-default/:
        mach_resources.h 
      2.6/include/asm-i386/mach-pc9800/:
        mach_resources.h 
      2.6/include/asm-mips/:
        mv64340_dep.h page-32.h page-64.h 
      2.6/include/asm-mips/mach-au1x00/:
        au1000_pcmcia.h 
      2.6/include/asm-mips/sn/:
        intr_public.h 
      2.6/include/linux/:
        rmap-locking.h 
      2.6/include/linux/sunrpc/:
        name_lookup.h 
      2.6/include/net/irda/:
        ali-ircc.h au1000_ircc.h irda-usb.h irport.h nsc-ircc.h 
        smc-ircc.h toshoboe.h vlsi_ir.h w83977af.h w83977af_ir.h 
      2.6/scripts/:
        MAKEDEV.ide MAKEDEV.snd 
      2.6/sound/oss/:
        724hwmcode.h Hwmcode.h 
  
  Revision      Changes    Path
  1.8           +229 -131  2.6/Makefile
  1.6           +34 -40    2.6/arch/ppc/defconfig
  1.6           +34 -40    2.6/arch/ppc/configs/apus_defconfig
  1.6           +5 -4      2.6/arch/ppc/kernel/head.S
  1.6           +18 -3     2.6/arch/ppc/kernel/misc.S
  1.5           +2 -2      2.6/arch/ppc/mm/pgtable.c