CVS Update@oss.sgi.com: linux

[Ralf Baechle <ralf@oss.sgi.com>]

CVSROOT:        /home/pub/cvs
Module name:    linux
Changes by:     ralf@oss.sgi.com        01/01/10 09:18:11

Modified files:
        .              : CREDITS MAINTAINERS Makefile Rules.make 
        Documentation  : Changes Configure.help devices.txt 
                         kernel-parameters.txt modules.txt parport.txt 
        Documentation/DocBook: Makefile kernel-api.tmpl 
                               kernel-locking.tmpl 
        Documentation/networking: sis900.txt 
        Documentation/sound: ALS Soundblaster 
        Documentation/video4linux/bttv: Insmod-options Modules.conf 
                                        README 
        arch/alpha     : config.in 
        arch/alpha/kernel: Makefile smp.c 
        arch/alpha/lib : Makefile ev6-memcpy.S memmove.S 
        arch/alpha/math-emu: Makefile 
        arch/alpha/mm  : fault.c 
        arch/i386      : Makefile config.in defconfig 
        arch/i386/boot : setup.S 
        arch/i386/kernel: Makefile bluesmoke.c cpuid.c dmi_scan.c ldt.c 
                          msr.c pci-irq.c process.c setup.c smp.c 
                          smpboot.c time.c 
        arch/i386/lib  : Makefile delay.c 
        arch/i386/math-emu: Makefile fpu_system.h 
        arch/i386/mm   : Makefile 
        arch/m68k/amiga: Makefile 
        arch/m68k/apollo: Makefile 
        arch/m68k/atari: Makefile 
        arch/m68k/bvme6000: Makefile 
        arch/m68k/hp300: Makefile 
        arch/m68k/kernel: Makefile semaphore.c setup.c sun3-head.S 
        arch/m68k/lib  : Makefile 
        arch/m68k/mac  : Makefile 
        arch/m68k/math-emu: Makefile 
        arch/m68k/mm   : Makefile sun3mmu.c 
        arch/m68k/mvme147: Makefile 
        arch/m68k/mvme16x: Makefile 
        arch/m68k/q40  : Makefile 
        arch/m68k/sun3 : Makefile config.c dvma.c mmu_emu.c sun3ints.c 
        arch/m68k/sun3x: Makefile 
        arch/mips      : config.in defconfig defconfig-atlas 
                         defconfig-cp7000 defconfig-ddb5476 
                         defconfig-decstation defconfig-ev64120 
                         defconfig-ev96100 defconfig-ip22 
                         defconfig-malta defconfig-rm200 
        arch/mips/arc  : Makefile 
        arch/mips/baget: Makefile 
        arch/mips/baget/prom: Makefile 
        arch/mips/ddb5074: Makefile 
        arch/mips/ddb5476: Makefile 
        arch/mips/dec  : Makefile 
        arch/mips/dec/boot: Makefile 
        arch/mips/galileo-boards/ev64120: Makefile 
        arch/mips/galileo-boards/ev96100: Makefile 
        arch/mips/galileo-boards/generic: Makefile 
        arch/mips/jazz : Makefile 
        arch/mips/kernel: Makefile setup.c 
        arch/mips/lib  : Makefile 
        arch/mips/math-emu: Makefile 
        arch/mips/mips-boards/atlas: Makefile 
        arch/mips/mips-boards/generic: Makefile 
        arch/mips/mips-boards/malta: Makefile 
        arch/mips/mm   : Makefile 
        arch/mips/pmc/cp7000: Makefile 
        arch/mips/sgi/kernel: Makefile 
        arch/mips/sni  : Makefile 
        arch/mips64    : Makefile defconfig defconfig-ip22 
                         defconfig-ip27 
        arch/mips64/arc: Makefile 
        arch/mips64/boot: Makefile 
        arch/mips64/kernel: Makefile setup.c 
        arch/mips64/lib: Makefile 
        arch/mips64/mm : Makefile 
        arch/mips64/sgi-ip22: Makefile 
        arch/mips64/sgi-ip27: Makefile 
        arch/ppc       : Makefile 
        arch/ppc/8260_io: Makefile 
        arch/ppc/8xx_io: Makefile 
        arch/ppc/amiga : Makefile 
        arch/ppc/kernel: Makefile 
        arch/ppc/lib   : Makefile 
        arch/ppc/math-emu: Makefile 
        arch/ppc/mm    : Makefile 
        arch/ppc/xmon  : Makefile 
        arch/sh        : Makefile vmlinux.lds.S 
        arch/sh/boot/compressed: head.S 
        arch/sh/kernel : Makefile ptrace.c setup.c sh_ksyms.c 
        arch/sh/lib    : Makefile 
        arch/sh/mm     : Makefile 
        arch/sparc     : Makefile 
        arch/sparc/kernel: Makefile 
        arch/sparc/lib : Makefile 
        arch/sparc/math-emu: Makefile 
        arch/sparc/mm  : Makefile 
        arch/sparc/prom: Makefile 
        arch/sparc64   : Makefile 
        arch/sparc64/kernel: Makefile pci.c sys_sparc32.c 
        arch/sparc64/lib: Makefile 
        arch/sparc64/math-emu: Makefile 
        arch/sparc64/mm: Makefile 
        arch/sparc64/prom: Makefile 
        arch/sparc64/solaris: Makefile misc.c 
        drivers        : Makefile 
        drivers/acpi   : Makefile cpu.c driver.c driver.h ec.c os.c 
                         sys.c table.c 
        drivers/acpi/common: Makefile cmalloc.c cmclib.c cmcopy.c 
                             cmdebug.c cmdelete.c cmeval.c cmglobal.c 
                             cminit.c cmobject.c cmutils.c cmxface.c 
        drivers/acpi/dispatcher: Makefile dsmethod.c dsmthdat.c 
                                 dsobject.c dsopcode.c dsutils.c 
                                 dswexec.c dswload.c dswscope.c 
                                 dswstate.c 
        drivers/acpi/events: Makefile evevent.c evmisc.c evregion.c 
                             evrgnini.c evsci.c evxface.c evxfevnt.c 
                             evxfregn.c 
        drivers/acpi/hardware: Makefile hwacpi.c hwcpu32.c hwgpe.c 
                               hwregs.c hwxface.c 
        drivers/acpi/include: accommon.h acconfig.h acdebug.h acdispat.h 
                              acenv.h acevents.h acexcep.h acglobal.h 
                              achware.h acinterp.h aclocal.h acmacros.h 
                              acnamesp.h acobject.h acoutput.h 
                              acparser.h acpiosxf.h acpixf.h actables.h 
                              actbl.h actypes.h amlcode.h 
        drivers/acpi/interpreter: Makefile amconfig.c amcreate.c 
                                  amdyadic.c amfield.c amfldio.c 
                                  ammisc.c ammonad.c amnames.c amprep.c 
                                  amregion.c amresnte.c amresolv.c 
                                  amresop.c amstore.c amstoren.c 
                                  amstorob.c amsystem.c amutils.c 
        drivers/acpi/namespace: Makefile nsaccess.c nsalloc.c nseval.c 
                                nsload.c nsnames.c nsobject.c nssearch.c 
                                nsutils.c nsxfname.c nsxfobj.c 
        drivers/acpi/parser: Makefile psargs.c psopcode.c psparse.c 
                             psscope.c pstree.c psutils.c pswalk.c 
                             psxface.c 
        drivers/acpi/resources: Makefile rsaddr.c rscalc.c rscreate.c 
                                rsdump.c rsio.c rsirq.c rslist.c 
                                rsmemory.c rsmisc.c rsutils.c rsxface.c 
        drivers/acpi/tables: Makefile tbget.c tbinstal.c tbutils.c 
                             tbxface.c 
        drivers/atm    : Config.in Makefile ambassador.c atmdev_init.c 
                         atmtcp.c fore200e.c horizon.c iphase.c 
                         nicstar.c 
        drivers/block  : Makefile acsi.c ll_rw_blk.c loop.c 
        drivers/block/paride: Makefile 
        drivers/cdrom  : Makefile cdrom.c 
        drivers/char   : Config.in Makefile dtlk.c epca.c 
                         generic_serial.c i810-tco.c mem.c pcxx.c 
                         sh-sci.c sx.c tty_io.c 
        drivers/char/agp: Makefile agp.h agpgart_be.c 
        drivers/char/drm: Makefile 
        drivers/char/ftape: Makefile 
        drivers/char/ftape/compressor: Makefile 
        drivers/char/ftape/lowlevel: Makefile 
        drivers/char/ftape/zftape: Makefile 
        drivers/char/joystick: Makefile 
        drivers/char/pcmcia: Makefile 
        drivers/char/rio: Makefile 
        drivers/fc4    : Makefile 
        drivers/i2c    : Makefile i2c-algo-pcf.c i2c-core.c i2c-dev.c 
        drivers/i2o    : Makefile 
        drivers/ide    : Config.in Makefile ide-cd.c ide-cd.h 
                         ide-floppy.c ide-tape.c 
        drivers/ieee1394: Makefile 
        drivers/input  : Makefile 
        drivers/isdn   : Config.in Makefile isdn_cards.c isdn_common.c 
                         isdn_net.c 
        drivers/isdn/act2000: Makefile 
        drivers/isdn/avmb1: Makefile capi.c kcapi.c 
        drivers/isdn/divert: Makefile 
        drivers/isdn/eicon: Makefile 
        drivers/isdn/hisax: Makefile config.c hfc_pci.c hisax.h isdnl1.c 
                            l3ni1.c netjet.c 
        drivers/isdn/hysdn: Makefile boardergo.c 
        drivers/isdn/icn: Makefile 
        drivers/isdn/isdnloop: Makefile 
        drivers/isdn/pcbit: Makefile drv.c 
        drivers/isdn/sc: Makefile 
        drivers/macintosh: Makefile 
        drivers/md     : Makefile lvm-snap.c lvm.c raid5.c 
        drivers/media  : Makefile 
        drivers/media/radio: Makefile radio-gemtek.c 
        drivers/media/video: Makefile bttv-cards.c bttv-driver.c bttv.h 
                             bttvp.h 
        drivers/misc   : Makefile 
        drivers/mtd    : Makefile cfi_probe.c docprobe.c mtdblock.c 
                         mtdchar.c nftlmount.c 
        drivers/net    : 3c523.c 8139too.c Config.in Makefile acenic.c 
                         acenic.h acenic_firmware.h arlan.c atarilance.c 
                         gmac.c hydra.c lance.c mac89x0.c mace.c 
                         ncr885e.c ncr885e.h ni5010.c ni52.c oaknet.c 
                         rcpci45.c sis900.c sis900.h smc9194.c stnic.c 
                         sun3lance.c winbond-840.c 
        drivers/net/appletalk: Makefile cops.c ltpc.c 
        drivers/net/arcnet: Makefile 
        drivers/net/fc : Makefile iph5526.c tach_structs.h 
        drivers/net/hamradio: Makefile bpqether.c mkiss.c yam.c 
        drivers/net/hamradio/soundmodem: Makefile 
        drivers/net/irda: Makefile smc-ircc.c 
        drivers/net/pcmcia: Makefile ray_cs.h 
        drivers/net/sk98lin: Makefile 
        drivers/net/skfp: Makefile 
        drivers/net/tokenring: Makefile 
        drivers/net/tulip: ChangeLog Makefile eeprom.c timer.c tulip.h 
                           tulip_core.c 
        drivers/net/wan: Makefile cosa.c 
        drivers/net/wan/lmc: Makefile 
        drivers/nubus  : Makefile 
        drivers/parport: Makefile parport_gsc.c 
        drivers/pci    : Makefile pci.ids quirks.c 
        drivers/pcmcia : Makefile cs.c 
        drivers/pnp    : Makefile quirks.c 
        drivers/sbus   : Makefile 
        drivers/sbus/audio: Makefile dmy.c 
        drivers/sbus/char: Makefile 
        drivers/scsi   : Config.in Makefile README.ibmmca README.tmscsim 
                         aha152x.c amiga7xx.c dc390.h eata_dma.c 
                         ibmmca.c ibmmca.h pci2000.c pci2220i.c scsi.h 
                         scsiiom.c sim710.c sr.c sr.h sr_ioctl.c 
                         sr_vendor.c st.c sun3_NCR5380.c sun3_scsi.c 
                         tmscsim.c tmscsim.h 
        drivers/scsi/pcmcia: Makefile 
        drivers/sgi    : Makefile 
        drivers/sgi/char: Makefile 
        drivers/sound  : Makefile cmpci.c cs4281.c es1370.c es1371.c 
                         esssolo1.c i810_audio.c mad16.c maestro.c 
                         sb_card.c sonicvibes.c trident.c 
                         via82cxxx_audio.c wavfront.c ymf_sb.c 
        drivers/sound/dmasound: Makefile 
        drivers/sound/emu10k1: Makefile 
        drivers/tc     : Makefile 
        drivers/telephony: Makefile ixj.c ixj.h 
        drivers/usb    : Makefile usb.c 
        drivers/usb/serial: Makefile 
        drivers/usb/storage: Makefile scsiglue.c usb.c 
        drivers/video  : Config.in Makefile amifb.c 
        drivers/video/matrox: Makefile matroxfb_DAC1064.c 
                              matroxfb_DAC1064.h matroxfb_base.c 
                              matroxfb_base.h matroxfb_crtc2.c 
        drivers/video/riva: Makefile 
        drivers/video/sis: Makefile 
        drivers/zorro  : Makefile 
        fs             : Makefile buffer.c exec.c inode.c namei.c 
        fs/adfs        : Makefile inode.c 
        fs/affs        : Makefile file.c symlink.c 
        fs/autofs      : Makefile 
        fs/autofs4     : Makefile 
        fs/bfs         : Makefile 
        fs/coda        : Makefile dir.c file.c inode.c symlink.c 
        fs/cramfs      : Makefile inode.c 
        fs/cramfs/inflate: Makefile 
        fs/devfs       : Makefile 
        fs/devpts      : Makefile 
        fs/efs         : Makefile symlink.c 
        fs/ext2        : Makefile balloc.c inode.c super.c 
        fs/fat         : Makefile cache.c inode.c 
        fs/hfs         : Makefile inode.c 
        fs/hpfs        : Makefile file.c namei.c 
        fs/isofs       : Makefile rock.c 
        fs/jffs        : Makefile inode-v23.c 
        fs/lockd       : Makefile svc.c xdr4.c 
        fs/minix       : Makefile 
        fs/msdos       : Makefile 
        fs/ncpfs       : Makefile symlink.c 
        fs/nfs         : Makefile file.c read.c write.c 
        fs/nfsd        : Makefile nfs3xdr.c vfs.c 
        fs/nls         : Config.in Makefile 
        fs/ntfs        : Makefile fs.c 
        fs/openpromfs  : Makefile 
        fs/partitions  : Makefile check.c 
        fs/proc        : Makefile 
        fs/qnx4        : Makefile inode.c 
        fs/ramfs       : Makefile inode.c 
        fs/romfs       : Makefile inode.c 
        fs/smbfs       : Makefile file.c 
        fs/sysv        : Makefile 
        fs/udf         : Makefile file.c symlink.c 
        fs/ufs         : Makefile 
        fs/umsdos      : Makefile 
        fs/vfat        : Makefile namei.c 
        include/asm-alpha: mmu_context.h pgalloc.h processor.h smp.h 
                           system.h 
        include/asm-arm: processor.h 
        include/asm-i386: delay.h desc.h mmu_context.h pgtable.h 
                          processor.h uaccess.h 
        include/asm-ia64: processor.h 
        include/asm-m68k: dvma.h hardirq.h ide.h intersil.h 
                          mmu_context.h processor.h semaphore-helper.h 
        include/asm-mips: delay.h 
        include/asm-mips64: delay.h 
        include/asm-parisc: mmu.h processor.h 
        include/asm-ppc: mmu.h processor.h 
        include/asm-s390: processor.h 
        include/asm-sh : processor.h 
        include/asm-sparc: contregs.h processor.h 
        include/asm-sparc64: processor.h 
        include/linux  : acpi.h agp_backend.h atm_tcp.h atmdev.h blk.h 
                         cdrom.h delay.h dtlk.h ext2_fs.h ext2_fs_sb.h 
                         fs.h generic_serial.h i2c-dev.h i2c-id.h i2c.h 
                         init.h ixjuser.h lvm.h major.h mm.h mtio.h 
                         nfs_page.h pagemap.h pci.h pci_ids.h sched.h 
                         shm.h slab.h swap.h telephony.h tqueue.h tty.h 
                         watchdog.h wireless.h zorro.h 
        include/linux/mtd: map.h mtd.h 
        include/linux/raid: md_k.h raid5.h 
        include/net    : ax25.h sock.h tcp.h tcp_ecn.h 
        init           : main.c 
        ipc            : Makefile shm.c util.c 
        kernel         : Makefile exit.c fork.c kmod.c ksyms.c printk.c 
                         softirq.c sysctl.c 
        lib            : Makefile 
        mm             : Makefile filemap.c memory.c mlock.c mmap.c 
                         mprotect.c mremap.c swap_state.c swapfile.c 
                         vmscan.c 
        net            : Makefile 
        net/802        : Makefile 
        net/802/transit: Makefile 
        net/appletalk  : Makefile 
        net/atm        : Makefile addr.c common.c lec.c proc.c 
                         resources.c signaling.c 
        net/ax25       : Makefile af_ax25.c ax25_addr.c ax25_dev.c 
                         ax25_ds_in.c ax25_ds_subr.c ax25_ds_timer.c 
                         ax25_iface.c ax25_in.c ax25_ip.c ax25_out.c 
                         ax25_route.c ax25_std_in.c ax25_std_subr.c 
                         ax25_std_timer.c ax25_subr.c ax25_timer.c 
                         ax25_uid.c 
        net/bridge     : Makefile br_input.c 
        net/core       : Makefile skbuff.c sock.c 
        net/decnet     : Makefile 
        net/econet     : Makefile 
        net/ethernet   : Makefile 
        net/ipv4       : Makefile af_inet.c ip_fragment.c ipconfig.c 
                         tcp_input.c udp.c 
        net/ipv4/netfilter: Makefile 
        net/ipv6       : Makefile 
        net/ipv6/netfilter: Makefile 
        net/ipx        : Makefile 
        net/irda       : Makefile 
        net/irda/compressors: Makefile 
        net/irda/ircomm: Makefile 
        net/irda/irlan : Makefile 
        net/irda/irnet : Makefile 
        net/khttpd     : Makefile 
        net/lapb       : Makefile 
        net/netlink    : Makefile 
        net/netrom     : Makefile af_netrom.c nr_dev.c nr_in.c 
                         nr_loopback.c nr_out.c nr_route.c nr_subr.c 
                         nr_timer.c 
        net/packet     : Makefile 
        net/rose       : Makefile af_rose.c rose_dev.c rose_in.c 
                         rose_link.c rose_loopback.c rose_out.c 
                         rose_route.c rose_subr.c rose_timer.c 
        net/sched      : Makefile 
        net/sunrpc     : Makefile 
        net/unix       : Makefile 
        net/wanrouter  : Makefile 
        net/x25        : Makefile af_x25.c 
        scripts        : Configure kernel-doc 
Added files:
        Documentation/DocBook: sis900.tmpl 
        Documentation/i2c: functionality 
        arch/alpha/lib : ev67-strrchr.S 
        arch/m68k/ifpsp060/src: README-SRC fplsp.S fpsp.S ftest.S ilsp.S 
                                isp.S itest.S pfpsp.S 
        drivers/acpi   : cmbatt.c ec.h ksyms.c power.c 
        drivers/acpi/include: acgcc.h aclinux.h actbl1.h actbl2.h 
                              actbl71.h 
        drivers/acpi/namespace: nsinit.c 
        drivers/acpi/tables: tbconvrt.c tbxfroot.c 
        drivers/atm    : firestream.c firestream.h 
        drivers/scsi   : README.osst osst.c osst.h osst_detect.h 
                         osst_options.h 
        drivers/video/matrox: matroxfb_g450.c matroxfb_g450.h 
        include/asm-alpha: mmu.h 
        include/asm-arm: mmu.h 
        include/asm-i386: mmu.h 
        include/asm-ia64: mmu.h 
        include/asm-m68k: contregs.h fbio.h idprom.h kbio.h mmu.h 
                          vuid_event.h 
        include/asm-mips: mmu.h 
        include/asm-mips64: mmu.h 
        include/asm-s390: mmu.h 
        include/asm-sh : mmu.h 
        include/asm-sparc: mmu.h 
        include/asm-sparc64: mmu.h 
        include/linux  : shmem_fs.h 
        mm             : shmem.c 
Removed files:
        arch/i386/kernel: acpi.c 
        drivers/acpi/include: actbl32.h actbl64.h 
        drivers/acpi/interpreter: amdump.c 
        drivers/acpi/namespace: nsdump.c 
        drivers/acpi/parser: psfind.c 
        drivers/acpi/tables: tbtable.c 
        drivers/isdn/avmb1: b1capi.c b1lli.c 
        drivers/isdn/hisax: foreign.c foreign.h 

Log message:
        Merge with Linux 2.4.0-prerelease.  Big Makefile rewrite, test your
        Makefiles.