Menu
▾
▴
CVS Update: 2.6 (branch: trunk)
|
From: Roman Z. <zi...@us...> - 2004-07-03 20:50:55
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/pci/ice1712/
Changes by: zi...@sc....(none) 04/07/03 13:50:49
Log message:
conflict fixes from import of 2.6.7
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
2.6/arch/ppc/mm/:
Makefile init.c pgtable.c
2.6/include/asm-m68k/:
bootinfo.h
2.6/include/asm-ppc/:
io.h pgtable.h
Removed files:
2.6/Documentation/arm/SA1100/:
PCMCIA
2.6/Documentation/arm/XScale/:
cache-lock.txt pmu.txt tlb-lock.txt
2.6/Documentation/arm/XScale/ADIFCC/:
80200EVB
2.6/Documentation/arm/XScale/IOP3XX/:
IQ80310 IQ80321 aau.txt dma.txt message.txt pmon.txt
2.6/arch/arm/mach-omap/:
innovator1510.c innovator1610.c irq.h omap-generic.c
omap-perseus2.c
2.6/arch/cris/kernel/:
hexify.c ksyms.c
2.6/arch/i386/mach-es7000/:
es7000.c setup.c topology.c
2.6/arch/ia64/kernel/:
perfmon_hpsim.h
2.6/arch/ppc/mm/:
cachemap.c
2.6/arch/ppc/ocp/:
Makefile ocp-driver.c ocp-probe.c ocp.c
2.6/arch/s390/lib/:
memset.S memset64.S strcmp.S strcmp64.S strcpy.S
strcpy64.S strncpy.S strncpy64.S
2.6/drivers/char/:
dz.c dz.h sh-sci.c sh-sci.h
2.6/drivers/i2c/busses/:
i2c-ixp42x.c
2.6/drivers/ide/:
ide-tcq.c
2.6/drivers/ide/pci/:
alim15x3.h amd74xx.h cmd640.h cs5520.h cs5530.h ns87415.h
rz1000.h sc1200.h siimage.h sis5513.h sl82c105.h
slc90e66.h triflex.h trm290.h via82cxxx.h
2.6/drivers/ide/ppc/:
swarm.c
2.6/drivers/net/:
auto_irq.c rcif.h rclanmtl.c rclanmtl.h rcpci45.c
2.6/drivers/net/wan/:
comx-hw-comx.c comx-hw-locomx.c comx-hw-mixcom.c
comx-hw-munich.c comx-proto-fr.c comx-proto-lapb.c
comx-proto-ppp.c comx.c comx.h comxhw.h falc-lh.h hscx.h
mixcom.h munich32x.h wanxlfw.inc
2.6/drivers/pcmcia/:
sa1100.h sa11xx_core.c sa11xx_core.h
2.6/drivers/scsi/:
qlogicfas.h
2.6/drivers/scsi/pcmcia/:
qlogic_core.c
2.6/drivers/usb/core/:
driverfs.c
2.6/fs/intermezzo/:
Makefile cache.c dcache.c dir.c ext_attr.c file.c
fileset.c inode.c intermezzo_fs.h intermezzo_idl.h
intermezzo_journal.h intermezzo_kml.h intermezzo_lib.h
intermezzo_psdev.h intermezzo_upcall.h journal.c
journal_ext2.c journal_ext3.c journal_obdfs.c
journal_reiserfs.c journal_tmpfs.c journal_xfs.c kml.c
kml_decode.c kml_reint.c kml_setup.c kml_unpack.c
kml_utils.c methods.c presto.c psdev.c replicator.c
super.c sysctl.c upcall.c vfs.c
2.6/fs/xfs/linux/:
kmem.h mrlock.h mutex.h sema.h spin.h sv.h time.h
xfs_aops.c xfs_buf.c xfs_buf.h xfs_cred.h xfs_file.c
xfs_fs_subr.c xfs_fs_subr.h xfs_globals.c xfs_globals.h
xfs_ioctl.c xfs_iops.c xfs_iops.h xfs_linux.h xfs_lrw.c
xfs_lrw.h xfs_stats.c xfs_stats.h xfs_super.c xfs_super.h
xfs_sysctl.c xfs_sysctl.h xfs_version.h xfs_vfs.c
xfs_vfs.h xfs_vnode.c xfs_vnode.h
2.6/include/asm-alpha/:
rmap.h
2.6/include/asm-arm/:
rmap.h
2.6/include/asm-arm/arch-cl7500/:
ide.h keyboard.h
2.6/include/asm-arm/arch-clps711x/:
keyboard.h
2.6/include/asm-arm/arch-ebsa110/:
ide.h
2.6/include/asm-arm/arch-ebsa285/:
ide.h
2.6/include/asm-arm/arch-iop3xx/:
ide.h
2.6/include/asm-arm/arch-l7200/:
ide.h keyboard.h
2.6/include/asm-arm/arch-nexuspci/:
ide.h
2.6/include/asm-arm/arch-omap/:
omap-h2.h omap-innovator.h omap-perseus2.h
2.6/include/asm-arm/arch-pxa/:
ide.h keyboard.h
2.6/include/asm-arm/arch-rpc/:
ide.h
2.6/include/asm-arm/arch-s3c2410/:
ide.h
2.6/include/asm-arm/arch-sa1100/:
keyboard.h
2.6/include/asm-arm/arch-shark/:
ide.h keyboard.h
2.6/include/asm-arm/arch-tbox/:
ide.h
2.6/include/asm-arm26/:
rmap.h
2.6/include/asm-cris/:
rmap.h
2.6/include/asm-generic/:
rmap.h
2.6/include/asm-h8300/:
h8300_smsc.h
2.6/include/asm-h8300/aki3068net/:
machine-depend.h
2.6/include/asm-h8300/edosk2674/:
machine-depend.h
2.6/include/asm-h8300/generic/:
machine-depend.h timer_rate.h
2.6/include/asm-h8300/h8max/:
machine-depend.h
2.6/include/asm-i386/:
rmap.h
2.6/include/asm-ia64/:
rmap.h
2.6/include/asm-m68k/:
rmap.h
2.6/include/asm-m68knommu/:
rmap.h
2.6/include/asm-mips/:
rmap.h
2.6/include/asm-parisc/:
rmap.h
2.6/include/asm-ppc/:
rmap.h
2.6/include/asm-ppc64/:
rmap.h
2.6/include/asm-s390/:
rmap.h
2.6/include/asm-sh/:
rmap.h
2.6/include/asm-sparc/:
rmap.h
2.6/include/asm-sparc64/:
rmap.h
2.6/include/asm-um/:
rmap.h
2.6/include/asm-v850/:
rmap.h
2.6/include/asm-x86_64/:
rmap.h
2.6/net/bluetooth/:
syms.c
2.6/sound/pci/ice1712/:
prodigy.c prodigy.h
Revision Changes Path
1.9 +24 -12 2.6/Makefile
1.3 +2 -3 2.6/arch/ppc/Makefile
1.7 +6 -6 2.6/arch/ppc/defconfig
1.7 +6 -6 2.6/arch/ppc/configs/apus_defconfig
1.5 +2 -1 2.6/arch/ppc/kernel/Makefile
1.5 +139 -13 2.6/arch/ppc/kernel/entry.S
1.7 +11 -11 2.6/arch/ppc/kernel/head.S
1.7 +22 -9 2.6/arch/ppc/kernel/misc.S
1.7 +2 -14 2.6/arch/ppc/kernel/ppc_ksyms.c
1.6 +7 -0 2.6/arch/ppc/kernel/setup.c
1.4 +0 -1 2.6/arch/ppc/mm/Makefile
1.4 +12 -2 2.6/arch/ppc/mm/init.c
1.6 +19 -9 2.6/arch/ppc/mm/pgtable.c
1.3 +5 -5 2.6/include/asm-m68k/bootinfo.h
1.7 +0 -38 2.6/include/asm-ppc/io.h
1.5 +15 -1 2.6/include/asm-ppc/pgtable.h
|
