Menu
▾
▴
CVS Update: 2.3 (branch: trunk)
|
From: Roman Z. <zi...@us...> - 2003-07-03 12:14:30
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.3
Repository: 2.3/include/linux/
Changes by: zippel@sc8-pr-cvs1. 03/07/03 05:14:29
Log message:
conflict fixes from import linuxppc (2.4.21)
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 ppc-stub.c ppc_ksyms.c setup.c time.c
2.3/arch/ppc/mm/:
pgtable.c
2.3/arch/ppc/platforms/:
apus_setup.c
2.3/drivers/char/:
Config.in Makefile mem.c
2.3/drivers/ide/:
ide-probe.c
2.3/drivers/net/:
8390.h Makefile
2.3/drivers/scsi/:
Config.in Makefile amiga7xx.c fastlane.c
2.3/drivers/sound/dmasound/:
dmasound_core.c
2.3/drivers/video/:
Config.in fbmem.c
2.3/fs/:
buffer.c
2.3/include/asm-ppc/:
bootinfo.h io.h mpc8xx.h
2.3/include/linux/:
fs.h rtc.h
Removed files:
2.3/Documentation/usb/:
scanner-hp-sane.txt
2.3/arch/ia64/sn/configs/sn1/:
defconfig-bigsur-mp defconfig-bigsur-sp defconfig-dig-mp
defconfig-dig-sp defconfig-generic-mp
defconfig-generic-sp defconfig-hp-sp
defconfig-prom-medusa defconfig-sn1-mp
defconfig-sn1-mp-modules defconfig-sn1-mp-syn1-0
defconfig-sn1-sp
2.3/arch/ia64/sn/configs/sn2/:
defconfig-dig-numa defconfig-sn2-dig-mp
defconfig-sn2-dig-sp defconfig-sn2-mp
defconfig-sn2-mp-modules defconfig-sn2-prom-medusa
defconfig-sn2-sp
2.3/arch/ppc/boot/simple/:
direct.S
2.3/arch/ppc/kernel/:
pci.h
2.3/drivers/ide/:
aec62xx.c ali14xx.c alim15x3.c amd74xx.c ataraid.c
ataraid.h buddha.c cmd640.c cmd64x.c cs5530.c cy82c693.c
dtc2278.c falconide.c gayle.c hd.c hpt34x.c hpt366.c
hptraid.c hptraid.h ht6560b.c icside.c ide-adma.c
ide-cs.c ide-features.c ide-m8xx.c ide-pci.c ide-pmac.c
ide-sibyte.c it8172.c macide.c ns87415.c opti621.c
pdc202xx.c pdc4030.c pdc4030.h pdcraid.c pdcraid.h piix.c
q40ide.c qd65xx.c qd65xx.h rapide.c rz1000.c
serverworks.c sis5513.c sl82c105.c slc90e66.c trm290.c
umc8672.c via82cxxx.c
2.3/drivers/isdn/hisax/:
amd7930.c rawhdlc.c rawhdlc.h
2.3/drivers/mtd/:
bootldr.c
2.3/drivers/net/:
daynaport.c
2.3/drivers/net/e100/:
e100_proc.c e100_vendor.h
2.3/drivers/net/e1000/:
e1000_proc.c
2.3/drivers/net/wan/:
hdlc.c
2.3/drivers/s390/:
idals.c
2.3/drivers/usb/:
auerswald.c uhci-debug.h uhci.c uhci.h usb-ohci.c
usb-ohci.h usb-uhci-debug.h usb-uhci.c usb-uhci.h vicam.h
vicamurbs.h
2.3/drivers/usb/hcd/:
Config.in Makefile ehci-dbg.c ehci-hcd.c ehci-hub.c
ehci-mem.c ehci-q.c ehci-sched.c ehci.h
2.3/fs/befs/:
befs_fs.h compatibility.h
2.3/include/asm-ia64/:
offsets.h
Revision Changes Path
1.35 +7 -6 2.3/Makefile
1.27 +497 -90 2.3/Documentation/Configure.help
1.14 +0 -1 2.3/arch/ppc/Makefile
1.34 +46 -10 2.3/arch/ppc/config.in
1.25 +46 -12 2.3/arch/ppc/defconfig
1.11 +0 -3 2.3/arch/ppc/amiga/amiints.c
1.7 +0 -3 2.3/arch/ppc/amiga/cia.c
1.17 +0 -3 2.3/arch/ppc/amiga/config.c
1.20 +46 -12 2.3/arch/ppc/configs/apus_defconfig
1.29 +53 -220 2.3/arch/ppc/kernel/head.S
1.8 +15 -38 2.3/arch/ppc/kernel/ppc-stub.c
1.33 +15 -9 2.3/arch/ppc/kernel/ppc_ksyms.c
1.26 +18 -102 2.3/arch/ppc/kernel/setup.c
1.20 +1 -6 2.3/arch/ppc/kernel/time.c
1.6 +20 -10 2.3/arch/ppc/mm/pgtable.c
1.3 +0 -3 2.3/arch/ppc/platforms/apus_setup.c
1.9 +19 -1 2.3/drivers/char/Config.in
1.22 +24 -2 2.3/drivers/char/Makefile
1.13 +85 -1 2.3/drivers/char/mem.c
1.9 +660 -331 2.3/drivers/ide/ide-probe.c
1.6 +4 -3 2.3/drivers/net/8390.h
1.15 +13 -5 2.3/drivers/net/Makefile
1.15 +2 -0 2.3/drivers/scsi/Config.in
1.11 +6 -1 2.3/drivers/scsi/Makefile
1.5 +2 -2 2.3/drivers/scsi/amiga7xx.c
1.10 +4 -4 2.3/drivers/scsi/fastlane.c
1.8 +1 -1 2.3/drivers/sound/dmasound/dmasound_core.c
1.10 +18 -9 2.3/drivers/video/Config.in
1.16 +7 -0 2.3/drivers/video/fbmem.c
1.5 +23 -28 2.3/fs/buffer.c
1.10 +4 -6 2.3/include/asm-ppc/bootinfo.h
1.14 +45 -11 2.3/include/asm-ppc/io.h
1.8 +19 -21 2.3/include/asm-ppc/mpc8xx.h
1.7 +34 -15 2.3/include/linux/fs.h
1.3 +4 -4 2.3/include/linux/rtc.h
|
