|
From: Roman Z. <zi...@us...> - 2004-05-23 21:35:28
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.3
Repository: 2.3/include/asm-ppc/
Changes by: zi...@sc....(none) 04/05/23 14:35:21
Log message:
conflict fixes from import linuxppc (2.4.26)
Modified files:
./:
Makefile
2.3/Documentation/:
Configure.help
2.3/arch/ppc/:
Makefile config.in defconfig
2.3/arch/ppc/configs/:
apus_defconfig
2.3/arch/ppc/kernel/:
head.S ppc_ksyms.c setup.c
2.3/drivers/ide/:
ide-probe.c
2.3/drivers/video/:
amifb.c
Removed files:
2.3/arch/ppc/8260_io/:
Config.in Makefile commproc.c enet.c fcc_enet.c uart.c
2.3/arch/ppc/kernel/:
ppc8260_pic.c ppc8260_pic.h
2.3/include/asm-ppc/:
cpm_8260.h immap_8260.h
Revision Changes Path
1.40 +3 -2 2.3/Makefile
1.32 +109 -22 2.3/Documentation/Configure.help
1.17 +4 -4 2.3/arch/ppc/Makefile
1.38 +44 -11 2.3/arch/ppc/config.in
1.30 +1 -1 2.3/arch/ppc/defconfig
1.26 +1 -1 2.3/arch/ppc/configs/apus_defconfig
1.32 +3 -0 2.3/arch/ppc/kernel/head.S
1.36 +2 -0 2.3/arch/ppc/kernel/ppc_ksyms.c
1.30 +6 -0 2.3/arch/ppc/kernel/setup.c
1.13 +2 -1 2.3/drivers/ide/ide-probe.c
1.16 +2 -2 2.3/drivers/video/amifb.c
|