Menu
▾
▴
CVS Update: 2.6 (branch: trunk)
|
From: Roman Z. <zi...@us...> - 2005-07-30 20:49:32
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/pcmcia/
Changes by: zi...@sc....(none) 05/07/30 13:49:26
Log message:
conflict fixes from import of 2.6.10
Modified files:
./:
Makefile
2.6/arch/ppc/kernel/:
Makefile misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
pgtable.c
2.6/drivers/block/:
amiflop.c
2.6/include/asm-m68k/:
bootinfo.h
2.6/include/asm-ppc/:
io.h machdep.h pgtable.h
Removed files:
2.6/Documentation/:
digiboard.txt mkdev.ida
2.6/Documentation/DocBook/:
mousedrivers.tmpl
2.6/Documentation/dvb/:
firmware.txt
2.6/Documentation/isdn/:
README.eicon
2.6/Documentation/sound/oss/:
ChangeLog.awe ChangeLog.multisound
2.6/arch/arm/:
defconfig
2.6/arch/arm/boot/compressed/:
hw-bse.c
2.6/arch/arm/configs/:
adsbitsy_defconfig brutus_defconfig empeg_defconfig
flexanet_defconfig freebird_defconfig
freebird_new_defconfig graphicsclient_defconfig
graphicsmaster_defconfig huw_webpanel_defconfig
pangolin_defconfig pfs168_mqtft_defconfig
pfs168_mqvga_defconfig pfs168_sastn_defconfig
pfs168_satft_defconfig sherman_defconfig stork_defconfig
system3_defconfig trizeps_defconfig
2.6/arch/arm/lib/:
io-readsl-armv3.S io-readsl-armv4.S
2.6/arch/arm/mach-footbridge/:
arch.c irq.c mm.c
2.6/arch/arm/mach-iop3xx/:
arch.c iop321-mm.c iop331-mm.c mm-321.c
2.6/arch/arm/mach-omap/:
clocks.c
2.6/arch/arm/mach-sa1100/:
adsbitsy.c brutus.c empeg.c flexanet.c freebird.c
graphicsclient.c graphicsmaster.c huw_webpanel.c itsy.c
leds-adsbitsy.c leds-brutus.c leds-flexanet.c
leds-graphicsclient.c leds-graphicsmaster.c leds-pfs168.c
leds-system3.c nanoengine.c omnimeter.c pangolin.c
pfs168.c sherman.c stork.c system3.c trizeps.c xp860.c
yopy.c
2.6/arch/cris/arch-v10/drivers/:
ethernet.c ide.c serial.c serial.h
2.6/arch/h8300/platform/h8300h/aki3068net/:
ram.ld
2.6/arch/h8300/platform/h8300h/generic/:
ram.ld rom.ld
2.6/arch/h8300/platform/h8300h/h8max/:
ram.ld
2.6/arch/h8300/platform/h8s/edosk2674/:
ram.ld rom.ld
2.6/arch/h8300/platform/h8s/generic/:
ram.ld rom.ld
2.6/arch/i386/kernel/cpu/cpufreq/:
acpi.c
2.6/arch/i386/pci/:
changelog
2.6/arch/ia64/configs/:
generic_defconfig
2.6/arch/ia64/sn/io/:
Makefile cdl.c io.c snia_if.c xswitch.c
2.6/arch/ia64/sn/io/drivers/:
Makefile ioconfig_bus.c
2.6/arch/ia64/sn/io/hwgfs/:
Makefile hcl.c hcl_util.c interface.c labelcl.c ramfs.c
2.6/arch/ia64/sn/io/machvec/:
Makefile iomv.c pci.c pci_bus_cvlink.c pci_dma.c
2.6/arch/ia64/sn/io/platform_init/:
Makefile sgi_io_init.c
2.6/arch/ia64/sn/io/sn2/:
Makefile bte_error.c geo_op.c klconflib.c klgraph.c
l1_command.c ml_SN_init.c ml_SN_intr.c ml_iograph.c
module.c pciio.c pic.c shub.c shub_intr.c shuberror.c
shubio.c xbow.c xtalk.c
2.6/arch/ia64/sn/io/sn2/pcibr/:
Makefile pcibr_ate.c pcibr_config.c pcibr_dvr.c
pcibr_error.c pcibr_hints.c pcibr_intr.c pcibr_reg.c
pcibr_rrb.c pcibr_slot.c
2.6/arch/ia64/sn/kernel/:
probe.c
2.6/arch/m68knommu/platform/5282/:
Makefile config.c pit.c
2.6/arch/m68knommu/platform/5282/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5282/senTec/:
crt0_ram.S
2.6/arch/mips/baget/:
Makefile baget.c bagetIRQ.S balo.c balo_supp.S irq.c
ld.script.balo print.c reset.c setup.c time.c
2.6/arch/mips/baget/prom/:
Makefile init.c
2.6/arch/mips/configs/:
bosporus_defconfig mirage_defconfig mtx1_defconfig
pb1000_defconfig xxs1500_defconfig
2.6/arch/mips/ddb5xxx/common/:
irq.c
2.6/arch/mips/hp-lj/:
Makefile asic.c gdb_hook.c init.c int-handler.S irq.c
setup.c utils.c utils.h
2.6/arch/mips/mm/:
tlbex64-r4k.S
2.6/arch/mips/pci/:
fixup-lasat.c pci-hplj.c
2.6/arch/mips/ramdisk/:
Makefile ld.script
2.6/arch/parisc/kernel/:
head64.S
2.6/arch/ppc/8xx_io/:
uart.c
2.6/arch/ppc64/kernel/:
iSeries_IoMmTable.c iSeries_IoMmTable.h mf_proc.c
open_pic.c open_pic.h open_pic_defs.h open_pic_u3.c
2.6/arch/sh/tools/:
machgen.sh
2.6/arch/um/kernel/skas/:
exec_user.c
2.6/arch/um/kernel/skas/include/:
mmu.h mode.h mode_kern.h uaccess.h
2.6/arch/um/kernel/tt/include/:
mmu.h mode.h mode_kern.h uaccess.h
2.6/drivers/acpi/:
acpi_ksyms.c
2.6/drivers/char/:
README.computone README.cyclomY README.epca README.scc
2.6/drivers/ide/legacy/:
pdc4030.c pdc4030.h
2.6/drivers/ide/pci/:
hpt34x.h
2.6/drivers/media/dvb/dvb-core/:
Makefile.lib dvb_functions.c dvb_functions.h dvb_i2c.c
dvb_i2c.h dvb_ksyms.c
2.6/drivers/media/dvb/frontends/:
alps_tdlb7.c alps_tdmb7.c dst-bt878.h dst.c
grundig_29504-401.c grundig_29504-491.c sp887x_firm.h
2.6/drivers/mtd/:
mtdblock.h
2.6/drivers/mtd/maps/:
integrator-flash-v24.c
2.6/drivers/pci/hotplug/:
pciehp_sysfs.c
2.6/drivers/pcmcia/:
sa1100_adsbitsy.c sa1100_flexanet.c sa1100_freebird.c
sa1100_graphicsclient.c sa1100_graphicsmaster.c
sa1100_pangolin.c sa1100_pfs168.c sa1100_stork.c
sa1100_system3.c sa1100_trizeps.c sa1100_xp860.c
sa1100_yopy.c
2.6/drivers/scsi/:
dmx3191d.h i60uscsi.c i91uscsi.c i91uscsi.h ini9100u.c
ini9100u.h inia100.c inia100.h scsiiom.c
2.6/drivers/usb/host/:
hc_simple.c hc_simple.h hc_sl811.c hc_sl811.h
hc_sl811_rh.c
2.6/drivers/usb/misc/:
speedtch.c
2.6/fs/devpts/:
xattr.c xattr.h
2.6/fs/lockd/:
lockd_syms.c
2.6/include/asm-arm/arch-cl7500/:
serial.h
2.6/include/asm-arm/arch-ebsa110/:
serial.h
2.6/include/asm-arm/arch-ebsa285/:
serial.h
2.6/include/asm-arm/arch-epxa10db/:
serial.h
2.6/include/asm-arm/arch-h720x/:
serial.h
2.6/include/asm-arm/arch-imx/:
serial.h
2.6/include/asm-arm/arch-integrator/:
serial.h time.h
2.6/include/asm-arm/arch-iop3xx/:
serial.h
2.6/include/asm-arm/arch-ixp2000/:
serial.h
2.6/include/asm-arm/arch-ixp4xx/:
serial.h
2.6/include/asm-arm/arch-lh7a40x/:
serial.h
2.6/include/asm-arm/arch-omap/:
omap1610.h omap5912.h serial.h
2.6/include/asm-arm/arch-pxa/:
serial.h
2.6/include/asm-arm/arch-rpc/:
serial.h
2.6/include/asm-arm/arch-s3c2410/:
serial.h
2.6/include/asm-arm/arch-sa1100/:
adsbitsy.h flexanet.h freebird.h graphicsclient.h
graphicsmaster.h huw_webpanel.h itsy.h mftb2.h
omnimeter.h pangolin.h pfs168.h pleb.h serial.h stork.h
system3.h trizeps.h yopy.h
2.6/include/asm-arm/arch-shark/:
serial.h
2.6/include/asm-arm/arch-versatile/:
serial.h
2.6/include/asm-arm26/:
linux_logo.h
2.6/include/asm-h8300/:
linux_logo.h
2.6/include/asm-ia64/sn/:
cdl.h dmamap.h driver.h hcl.h hcl_util.h hwgfs.h
ifconfig_net.h ioc4.h ioconfig_bus.h ioerror.h
ioerror_handling.h iograph.h kldir.h labelcl.h pio.h
prio.h sgi.h slotnum.h sn_private.h vector.h
2.6/include/asm-ia64/sn/ksys/:
elsc.h l1.h
2.6/include/asm-ia64/sn/pci/:
bridge.h pci_bus_cvlink.h pci_defs.h pcibr.h
pcibr_private.h pciio.h pciio_private.h pic.h
2.6/include/asm-ia64/sn/sn2/:
addrs.h arch.h geo.h intr.h io.h shub.h shub_md.h
shub_mmr.h shub_mmr_t.h shubio.h slotnum.h sn_private.h
2.6/include/asm-ia64/sn/xtalk/:
xbow.h xbow_info.h xswitch.h xtalk.h xtalk_private.h
xtalkaddrs.h xwidget.h
2.6/include/asm-m68knommu/:
m5282sim.h shglcore.h shglports.h
2.6/include/asm-mips/:
pci_channel.h
2.6/include/asm-mips/baget/:
baget.h vac.h vic.h
2.6/include/asm-parisc/:
som.h
2.6/include/pcmcia/:
ftl.h memory.h
Revision Changes Path
1.13 +46 -21 2.6/Makefile
1.8 +1 -1 2.6/arch/ppc/kernel/Makefile
1.10 +3 -0 2.6/arch/ppc/kernel/misc.S
1.10 +1 -11 2.6/arch/ppc/kernel/ppc_ksyms.c
1.9 +4 -0 2.6/arch/ppc/kernel/setup.c
1.6 +3 -0 2.6/arch/ppc/kernel/time.c
1.9 +6 -6 2.6/arch/ppc/mm/pgtable.c
1.4 +2 -2 2.6/drivers/block/amiflop.c
1.4 +7 -0 2.6/include/asm-m68k/bootinfo.h
1.10 +197 -143 2.6/include/asm-ppc/io.h
1.7 +1 -0 2.6/include/asm-ppc/machdep.h
1.7 +2 -1 2.6/include/asm-ppc/pgtable.h
|
