Menu
▾
▴
CVS Update: 2.3 (branch: trunk)
|
From: Roman Z. <zi...@us...> - 2002-12-08 21:36:19
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.3
Repository: 2.3/scripts/cramfs/
Changes by: zippel@sc8-pr-cvs1. 02/12/08 13:36:18
Log message:
conflict fixes from import linuxppc (2.4.20)
Modified files:
./:
Makefile
2.3/Documentation/:
Configure.help
2.3/arch/ppc/:
Makefile config.in defconfig
2.3/arch/ppc/amiga/:
amiints.c cia.c config.c
2.3/arch/ppc/configs/:
apus_defconfig
2.3/arch/ppc/kernel/:
head.S irq.c ppc_ksyms.c setup.c time.c
2.3/arch/ppc/mm/:
init.c mmu_decl.h ppc_mmu.c
2.3/arch/ppc/platforms/:
apus_setup.c
2.3/drivers/char/:
Config.in Makefile amiserial.c genrtc.c mem.c
2.3/drivers/ide/:
Config.in ide-probe.c ide.c
2.3/drivers/net/:
8390.h Makefile ariadne2.c
2.3/drivers/parport/:
init.c
2.3/drivers/scsi/:
Config.in Makefile fastlane.c
2.3/drivers/sound/dmasound/:
dmasound_core.c
2.3/drivers/video/:
Config.in amifb.c fbcon.c fbmem.c pm2fb.c virgefb.c
2.3/fs/proc/:
proc_misc.c
2.3/include/asm-ppc/:
amigaints.h bootinfo.h mpc8xx.h page.h pgtable.h ppc4xx.h
rtc.h
2.3/include/linux/:
parport.h rtc.h
2.3/mm/:
page_alloc.c
Added files:
2.3/arch/mips/:
defconfig-cobalt
2.3/arch/mips/cobalt/:
Makefile int-handler.S pci.c reset.c setup.c via.c
2.3/drivers/video/sis/:
sis.h
2.3/include/asm-mips/:
highmem.h
Removed files:
2.3/arch/ia64/hp/:
hpsim_console.c hpsim_irq.c hpsim_machvec.c hpsim_setup.c
hpsim_ssc.h
2.3/arch/ia64/sn/:
Makefile
2.3/arch/ia64/sn/fprom/:
Makefile README fpmem.c fpmem.h fprom.lds fpromasm.S
fw-emu.c main.c runsim
2.3/arch/ia64/sn/io/:
devsupport.c huberror.c ip37.c mem_refcnt.c ml_SN_intr.c
pcibr.c
2.3/arch/ia64/sn/sn1/:
Makefile discontig.c error.c iomv.c irq.c llsc4.c llsc4.h
machvec.c mm.c probe.c setup.c smp.c sn1_asm.S
sn1_ksyms.c sv.c synergy.c
2.3/arch/mips/ddb5476/:
Makefile dbg_io.c int-handler.S irq.c nile4.c pci.c
prom.c setup.c time.c
2.3/arch/mips/ddb5xxx/common/:
irq_cpu.c pci.c pci_auto.c
2.3/arch/mips/dec/:
irq.c
2.3/arch/mips/kernel/:
r2300_misc.S r4k_misc.S
2.3/arch/mips/mm/:
andes.c mips32.c r2300.c r4xx0.c r5432.c rm7k.c sb1.c
2.3/arch/mips/philips/nino/:
kgdb.c reset.c rtc.c time.c
2.3/arch/mips/philips/nino/ramdisk/:
Makefile ld.script
2.3/arch/mips/sgi/kernel/:
Makefile indyIRQ.S indy_hpc.c indy_int.c indy_mc.c
indy_rtc.c indy_sc.c reset.c setup.c system.c time.c
2.3/arch/mips64/arc/:
Makefile arc_con.c cmdline.c console.c env.c file.c
identify.c init.c memory.c misc.c salone.c time.c tree.c
2.3/arch/mips64/kernel/:
r4k_tlb.S r4k_tlb_debug.c r4k_tlb_glue.S softfp.S
2.3/arch/mips64/math-emu/:
Makefile cp1emu.c dp_add.c dp_cmp.c dp_div.c dp_fint.c
dp_flong.c dp_frexp.c dp_fsp.c dp_logb.c dp_modf.c
dp_mul.c dp_scalb.c dp_simple.c dp_sqrt.c dp_sub.c
dp_tint.c dp_tlong.c ieee754.c ieee754.h ieee754d.c
ieee754dp.c ieee754dp.h ieee754int.h ieee754m.c
ieee754sp.c ieee754sp.h ieee754xcpt.c kernel_linkage.c
sp_add.c sp_cmp.c sp_div.c sp_fdp.c sp_fint.c sp_flong.c
sp_frexp.c sp_logb.c sp_modf.c sp_mul.c sp_scalb.c
sp_simple.c sp_sqrt.c sp_sub.c sp_tint.c sp_tlong.c
2.3/arch/mips64/mips-boards/atlas/:
Makefile atlas_int.c atlas_rtc.c atlas_setup.c
2.3/arch/mips64/mips-boards/generic/:
Makefile cmdline.c display.c gdb_hook.c init.c memory.c
mipsIRQ.S pci.c printf.c reset.c time.c
2.3/arch/mips64/mips-boards/malta/:
Makefile malta_int.c malta_rtc.c malta_setup.c
2.3/arch/mips64/sgi-ip22/:
Makefile ip22-berr.c ip22-hpc.c ip22-int.c ip22-irq.S
ip22-mc.c ip22-reset.c ip22-rtc.c ip22-sc.c ip22-setup.c
ip22-timer.c system.c time.c
2.3/arch/mips64/sgi-ip27/:
Makefile TODO ip27-berr.c ip27-console.c ip27-init.c
ip27-irq-glue.S ip27-irq.c ip27-klconfig.c ip27-klnuma.c
ip27-memory.c ip27-nmi.c ip27-pci-dma.c ip27-pci.c
ip27-reset.c ip27-rtc.c ip27-setup.c ip27-timer.c
2.3/arch/mips64/sgi-ip32/:
Makefile crime.c ip32-berr.c ip32-irq-glue.S ip32-irq.c
ip32-pci-dma.c ip32-pci.c ip32-rtc.c ip32-setup.c
ip32-timer.c
2.3/arch/mips64/tools/:
Makefile offset.c
2.3/arch/parisc/kernel/:
pdc.c real1.c
2.3/arch/parisc/mm/:
kmap.c pa11.c pa20.c
2.3/arch/ppc/kernel/:
apus_pci.c apus_pci.h apus_setup.c chrp_pci.c
chrp_setup.c chrp_smp.c chrp_time.c error_log.c
error_log.h gemini_pci.c gemini_prom.S gemini_setup.c
i8259.h local_irq.h oak_setup.c oak_setup.h open_pic.h
pmac_backlight.c pmac_feature.c pmac_nvram.c pmac_pci.c
pmac_pic.c pmac_pic.h pmac_setup.c pmac_smp.c pmac_time.c
ppc4xx_pic.h ppc_asm.h ppc_asm.tmpl prep_pci.c
prep_setup.c prep_time.c proc_rtas.c residual.c sleep.S
walnut_setup.c walnut_setup.h xics.c xics.h
2.3/arch/s390/kernel/:
ieee.h
2.3/drivers/bluetooth/:
hci_uart.c
2.3/drivers/char/:
acpi_serial.c
2.3/drivers/net/:
starfire_firmware.pl zlib.c zlib.h
2.3/drivers/scsi/:
cpqioctl.c
2.3/drivers/scsi/aacraid/:
sap1sup.c
2.3/drivers/scsi/aic7xxx/:
aic7770_linux.c aic7xxx.c aic7xxx_linux.c
aic7xxx_linux_host.h aic7xxx_linux_pci.c
2.3/drivers/usb/:
ibmcam.h
2.3/drivers/video/:
sti-bmode.h sti.h sticon-bmode.c sticon.c sticore.c
stifb.c
2.3/drivers/video/sis/:
325vtbl.h
2.3/fs/inflate_fs/:
Makefile adler32.c infblock.c infblock.h infcodes.c
infcodes.h inffast.c inffast.h inffixed.h inflate.c
inflate_syms.c inftrees.c inftrees.h infutil.c infutil.h
zconf.h zutil.h
2.3/fs/intermezzo/:
kml.c kml_decode.c kml_setup.c kml_utils.c
2.3/fs/jffs2/:
zlib.c zlib.h
2.3/fs/qnx4/:
BUGS TODO
2.3/include/asm-arm/:
vt.h
2.3/include/asm-arm/arch-sa1100/:
pcmcia.h
2.3/include/asm-ia64/:
acpi-ext.h acpikcfg.h efi.h
2.3/include/asm-ia64/sn/:
agent.h hubspc.h hwcntrs.h iobus.h mem_refcnt.h mmzone.h
mmzone_default.h mmzone_sn1.h nodemask.h synergy.h
2.3/include/asm-ia64/sn/ksys/:
i2c.h
2.3/include/asm-ia64/sn/sn1/:
kldir.h leds.h promlog.h router.h sn1.h uart16550.h
2.3/include/asm-mips/:
fp.h
2.3/include/asm-mips/ddb5xxx/:
debug.h pci.h
2.3/include/asm-mips/pmc/:
ev64120.h ev64120int.h
2.3/include/asm-parisc/:
bootdata.h hil.h md.h pdcpat.h real.h semaphore-helper.h
2.3/include/asm-ppc/:
board.h bseip.h est8260.h fads.h gemini.h gemini_serial.h
ivms8.h mbx.h oak.h rpxclassic.h rpxhiox.h rpxlite.h
spd8xx.h tqm8xx.h
2.3/include/asm-sparc/:
clock.h eeprom.h ultra.h
2.3/include/linux/:
acpi_serial.h udf_167.h udf_udf.h zlib_fs.h
2.3/include/net/bluetooth/:
bluez.h hci_uart.h hci_usb.h hci_vhci.h l2cap_core.h
2.3/net/bluetooth/:
l2cap_core.c l2cap_proc.c
2.3/scripts/cramfs/:
GNUmakefile cramfsck.c mkcramfs.c
Revision Changes Path
1.34 +58 -26 2.3/Makefile
1.25 +2356 -504 2.3/Documentation/Configure.help
1.13 +17 -7 2.3/arch/ppc/Makefile
1.33 +28 -7 2.3/arch/ppc/config.in
1.24 +53 -88 2.3/arch/ppc/defconfig
1.10 +3 -3 2.3/arch/ppc/amiga/amiints.c
1.6 +3 -4 2.3/arch/ppc/amiga/cia.c
1.16 +64 -91 2.3/arch/ppc/amiga/config.c
1.19 +53 -88 2.3/arch/ppc/configs/apus_defconfig
1.28 +188 -40 2.3/arch/ppc/kernel/head.S
1.16 +16 -27 2.3/arch/ppc/kernel/irq.c
1.32 +14 -9 2.3/arch/ppc/kernel/ppc_ksyms.c
1.25 +61 -68 2.3/arch/ppc/kernel/setup.c
1.19 +21 -18 2.3/arch/ppc/kernel/time.c
1.27 +40 -19 2.3/arch/ppc/mm/init.c
1.5 +2 -0 2.3/arch/ppc/mm/mmu_decl.h
1.5 +74 -92 2.3/arch/ppc/mm/ppc_mmu.c
1.2 +84 -23 2.3/arch/ppc/platforms/apus_setup.c
1.8 +129 -45 2.3/drivers/char/Config.in
1.21 +52 -3 2.3/drivers/char/Makefile
1.6 +8 -34 2.3/drivers/char/amiserial.c
1.3 +222 -222 2.3/drivers/char/genrtc.c
1.12 +5 -3 2.3/drivers/char/mem.c
1.6 +30 -19 2.3/drivers/ide/Config.in
1.7 +174 -12 2.3/drivers/ide/ide-probe.c
1.7 +431 -91 2.3/drivers/ide/ide.c
1.5 +12 -1 2.3/drivers/net/8390.h
1.14 +16 -1 2.3/drivers/net/Makefile
1.10 +2 -0 2.3/drivers/net/ariadne2.c
1.3 +1 -0 2.3/drivers/parport/init.c
1.14 +6 -4 2.3/drivers/scsi/Config.in
1.10 +10 -4 2.3/drivers/scsi/Makefile
1.9 +2 -0 2.3/drivers/scsi/fastlane.c
1.7 +19 -23 2.3/drivers/sound/dmasound/dmasound_core.c
1.9 +55 -22 2.3/drivers/video/Config.in
1.14 +0 -1 2.3/drivers/video/amifb.c
1.4 +2 -6 2.3/drivers/video/fbcon.c
1.15 +44 -10 2.3/drivers/video/fbmem.c
1.7 +1 -1 2.3/drivers/video/pm2fb.c
1.11 +6 -5 2.3/drivers/video/virgefb.c
1.3 +63 -38 2.3/fs/proc/proc_misc.c
1.7 +1 -1 2.3/include/asm-ppc/amigaints.h
1.9 +5 -1 2.3/include/asm-ppc/bootinfo.h
1.7 +11 -13 2.3/include/asm-ppc/mpc8xx.h
1.7 +10 -6 2.3/include/asm-ppc/page.h
1.16 +23 -18 2.3/include/asm-ppc/pgtable.h
1.4 +5 -3 2.3/include/asm-ppc/ppc4xx.h
1.2 +24 -11 2.3/include/asm-ppc/rtc.h
1.6 +4 -1 2.3/include/linux/parport.h
1.2 +30 -2 2.3/include/linux/rtc.h
1.23 +141 -84 2.3/mm/page_alloc.c
|
