From 294b6ebb36a3628697c63e465696ddb15672a497 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 15 May 2007 09:52:31 -0700 Subject: [PATCH] --- yaml --- r: 56415 b: refs/heads/master c: de7860c3f3272086a4c3a1b4280b11ffae7c32be h: refs/heads/master i: 56413: 56873b2504d0bf975955ba912c3d606b02206ab7 56411: f93be3080f1e8e56a9fe9aa78fa01ee9cc50c092 56407: 6c9dcd9cd5c4f490a752aecfa606e003671dbd78 56399: 6f80f1256739bb57e991e51414a836ae84749011 56383: c9a8c5d8c005151f923ff63e5d1c7d570c8b5c52 v: v3 --- [refs] | 2 +- trunk/CREDITS | 4 +- trunk/Documentation/SubmitChecklist | 6 +- .../feature-removal-schedule.txt | 27 +- trunk/Documentation/gpio.txt | 4 +- trunk/Documentation/kref.txt | 2 +- trunk/Documentation/mips/pci/pci.README | 54 - .../sound/alsa/ALSA-Configuration.txt | 21 +- trunk/Documentation/sound/alsa/Bt87x.txt | 4 +- .../video4linux/CARDLIST.saa7134 | 5 +- trunk/Documentation/video4linux/sn9c102.txt | 18 +- trunk/MAINTAINERS | 14 +- trunk/Makefile | 4 +- trunk/arch/arm/Kconfig | 62 +- trunk/arch/arm/Makefile | 2 + trunk/arch/arm/configs/at91sam9rlek_defconfig | 957 ++++ trunk/arch/arm/configs/ks8695_defconfig | 880 ++++ trunk/arch/arm/configs/trizeps4_defconfig | 532 ++- trunk/arch/arm/kernel/armksyms.c | 1 + trunk/arch/arm/kernel/ecard.c | 35 +- trunk/arch/arm/kernel/stacktrace.c | 12 +- trunk/arch/arm/kernel/time.c | 2 +- trunk/arch/arm/mach-at91/Kconfig | 17 + trunk/arch/arm/mach-at91/Makefile | 5 + trunk/arch/arm/mach-at91/at91rm9200_devices.c | 3 - .../arch/arm/mach-at91/at91sam9260_devices.c | 3 - .../arch/arm/mach-at91/at91sam9261_devices.c | 3 - .../arch/arm/mach-at91/at91sam9263_devices.c | 3 - trunk/arch/arm/mach-at91/at91sam9rl.c | 341 ++ trunk/arch/arm/mach-at91/at91sam9rl_devices.c | 630 +++ trunk/arch/arm/mach-at91/board-sam9261ek.c | 3 + trunk/arch/arm/mach-at91/board-sam9rlek.c | 204 + trunk/arch/arm/mach-at91/generic.h | 2 + trunk/arch/arm/mach-davinci/Kconfig | 23 + trunk/arch/arm/mach-davinci/Makefile | 10 + trunk/arch/arm/mach-davinci/Makefile.boot | 3 + trunk/arch/arm/mach-davinci/board-evm.c | 131 + trunk/arch/arm/mach-davinci/id.c | 94 + trunk/arch/arm/mach-davinci/io.c | 51 + trunk/arch/arm/mach-davinci/irq.c | 226 + trunk/arch/arm/mach-davinci/psc.c | 113 + trunk/arch/arm/mach-davinci/serial.c | 96 + trunk/arch/arm/mach-davinci/time.c | 372 ++ trunk/arch/arm/mach-ebsa110/io.c | 8 +- trunk/arch/arm/mach-iop13xx/Makefile | 1 + trunk/arch/arm/mach-iop13xx/irq.c | 5 +- trunk/arch/arm/mach-iop13xx/msi.c | 194 + trunk/arch/arm/mach-iop13xx/pci.c | 16 + trunk/arch/arm/mach-ks8695/Kconfig | 13 + trunk/arch/arm/mach-ks8695/Makefile | 15 + trunk/arch/arm/mach-ks8695/Makefile.boot | 8 + trunk/arch/arm/mach-ks8695/board-micrel.c | 60 + trunk/arch/arm/mach-ks8695/cpu.c | 73 + trunk/arch/arm/mach-ks8695/devices.c | 191 + trunk/arch/arm/mach-ks8695/generic.h | 15 + trunk/arch/arm/mach-ks8695/irq.c | 175 + trunk/arch/arm/mach-ks8695/time.c | 114 + trunk/arch/arm/mach-omap1/board-h2.c | 2 +- trunk/arch/arm/mach-omap1/pm.c | 11 +- trunk/arch/arm/mach-omap2/gpmc.c | 2 +- trunk/arch/arm/mach-omap2/mux.c | 33 +- trunk/arch/arm/mach-pnx4008/dma.c | 4 +- trunk/arch/arm/mach-pxa/trizeps4.c | 62 +- trunk/arch/arm/mach-s3c2410/Makefile | 2 +- trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c | 142 + trunk/arch/arm/mach-s3c2410/mach-h1940.c | 6 + trunk/arch/arm/mach-s3c2443/clock.c | 4 + trunk/arch/arm/mm/Kconfig | 10 +- trunk/arch/arm/plat-omap/dma.c | 4 +- trunk/arch/arm/plat-omap/mux.c | 19 +- trunk/arch/arm/tools/mach-types | 34 +- trunk/arch/frv/kernel/gdb-stub.c | 12 +- trunk/arch/h8300/kernel/syscalls.S | 78 +- trunk/arch/i386/Kconfig | 8 +- trunk/arch/i386/kernel/Makefile | 1 + trunk/arch/i386/kernel/head.S | 38 - trunk/arch/i386/kernel/paravirt.c | 1 - trunk/arch/i386/kernel/process.c | 1 + trunk/arch/i386/kernel/smp.c | 67 +- trunk/arch/i386/kernel/smpboot.c | 22 - trunk/arch/i386/kernel/smpcommon.c | 79 + trunk/arch/i386/kernel/syscall_table.S | 3 + trunk/arch/i386/kernel/traps.c | 5 - trunk/arch/i386/kernel/verify_cpu.S | 4 +- trunk/arch/i386/kernel/vmlinux.lds.S | 6 - trunk/arch/i386/mach-voyager/voyager_smp.c | 106 +- trunk/arch/i386/mm/init.c | 7 - trunk/arch/i386/mm/pgtable.c | 26 +- trunk/arch/ia64/Kconfig | 4 + trunk/arch/ia64/hp/common/hwsw_iommu.c | 2 +- trunk/arch/ia64/ia32/audit.c | 5 + trunk/arch/ia64/kernel/audit.c | 17 + trunk/arch/ia64/kernel/entry.S | 2 + trunk/arch/ia64/kernel/err_inject.c | 2 +- trunk/arch/ia64/kernel/irq.c | 11 + trunk/arch/ia64/kernel/kprobes.c | 12 +- trunk/arch/ia64/kernel/machvec.c | 2 +- trunk/arch/ia64/kernel/mca.c | 2 + trunk/arch/ia64/mm/contig.c | 2 +- trunk/arch/ia64/mm/discontig.c | 2 +- trunk/arch/ia64/mm/init.c | 51 - trunk/arch/ia64/sn/kernel/io_common.c | 2 +- trunk/arch/ia64/sn/kernel/xpc_partition.c | 2 +- trunk/arch/ia64/sn/kernel/xpnet.c | 4 +- trunk/arch/m32r/Kconfig | 4 + trunk/arch/m32r/mm/mmu.S | 22 +- trunk/arch/m68k/lib/uaccess.c | 4 +- trunk/arch/mips/Kconfig | 212 +- trunk/arch/mips/Makefile | 42 +- trunk/arch/mips/au1000/Kconfig | 142 + trunk/arch/mips/basler/excite/excite_device.c | 16 +- trunk/arch/mips/cobalt/Makefile | 2 +- trunk/arch/mips/cobalt/rtc.c | 63 + trunk/arch/mips/cobalt/serial.c | 85 + trunk/arch/mips/cobalt/setup.c | 31 - trunk/arch/mips/configs/cobalt_defconfig | 49 +- trunk/arch/mips/configs/db1000_defconfig | 1 + trunk/arch/mips/configs/db1100_defconfig | 1 + trunk/arch/mips/configs/db1200_defconfig | 1 + trunk/arch/mips/configs/db1500_defconfig | 1 + trunk/arch/mips/configs/db1550_defconfig | 1 + trunk/arch/mips/configs/jaguar-atx_defconfig | 897 ---- trunk/arch/mips/configs/jmr3927_defconfig | 1 - trunk/arch/mips/configs/pb1100_defconfig | 1 + trunk/arch/mips/configs/pb1500_defconfig | 1 + trunk/arch/mips/configs/pb1550_defconfig | 1 + ...ocelot_g_defconfig => rbhma4200_defconfig} | 379 +- trunk/arch/mips/configs/rbhma4500_defconfig | 1 - .../{tb0229_defconfig => tb0219_defconfig} | 24 +- trunk/arch/mips/kernel/early_printk.c | 11 +- trunk/arch/mips/kernel/irq-msc01.c | 10 +- trunk/arch/mips/kernel/irq.c | 4 +- trunk/arch/mips/kernel/time.c | 2 +- trunk/arch/mips/kernel/traps.c | 8 +- trunk/arch/mips/lib/Makefile | 2 +- trunk/arch/mips/lib/ucmpdi2.c | 19 + trunk/arch/mips/mips-boards/malta/malta_int.c | 21 +- trunk/arch/mips/mm/highmem.c | 2 - trunk/arch/mips/mm/init.c | 3 - trunk/arch/mips/mm/tlbex.c | 36 +- trunk/arch/mips/momentum/Kconfig | 6 - trunk/arch/mips/momentum/jaguar_atx/Makefile | 12 - trunk/arch/mips/momentum/jaguar_atx/dbg_io.c | 125 - trunk/arch/mips/momentum/jaguar_atx/irq.c | 94 - .../mips/momentum/jaguar_atx/ja-console.c | 101 - .../momentum/jaguar_atx/jaguar_atx_fpga.h | 54 - .../arch/mips/momentum/jaguar_atx/platform.c | 208 - trunk/arch/mips/momentum/jaguar_atx/prom.c | 210 - trunk/arch/mips/momentum/jaguar_atx/reset.c | 56 - trunk/arch/mips/momentum/jaguar_atx/setup.c | 475 -- trunk/arch/mips/momentum/ocelot_g/Makefile | 6 - trunk/arch/mips/momentum/ocelot_g/dbg_io.c | 121 - trunk/arch/mips/momentum/ocelot_g/gt-irq.c | 212 - trunk/arch/mips/momentum/ocelot_g/irq.c | 101 - .../arch/mips/momentum/ocelot_g/ocelot_pld.h | 30 - trunk/arch/mips/momentum/ocelot_g/prom.c | 84 - trunk/arch/mips/momentum/ocelot_g/reset.c | 47 - trunk/arch/mips/momentum/ocelot_g/setup.c | 267 -- trunk/arch/mips/pci/Makefile | 2 - trunk/arch/mips/pci/fixup-cobalt.c | 25 +- trunk/arch/mips/pci/fixup-jaguar.c | 43 - trunk/arch/mips/pci/fixup-ocelot-g.c | 37 - trunk/arch/mips/pci/pci-ocelot-g.c | 97 - trunk/arch/mips/sgi-ip22/Makefile | 2 +- trunk/arch/mips/sgi-ip22/ip22-platform.c | 177 + trunk/arch/powerpc/Kconfig | 5 +- trunk/arch/powerpc/Makefile | 2 +- trunk/arch/powerpc/boot/Makefile | 30 +- trunk/arch/powerpc/boot/cuboot-83xx.c | 2 +- trunk/arch/powerpc/boot/cuboot-85xx.c | 2 +- trunk/arch/powerpc/boot/dts/mpc832x_mds.dts | 2 +- trunk/arch/powerpc/boot/dts/mpc834x_mds.dts | 4 +- trunk/arch/powerpc/boot/dts/prpmc2800.dts | 315 ++ trunk/arch/powerpc/boot/mpsc.c | 170 + trunk/arch/powerpc/boot/mv64x60.c | 581 +++ trunk/arch/powerpc/boot/mv64x60.h | 70 + trunk/arch/powerpc/boot/mv64x60_i2c.c | 206 + trunk/arch/powerpc/boot/ops.h | 1 + trunk/arch/powerpc/boot/prpmc2800.c | 577 +++ trunk/arch/powerpc/boot/serial.c | 2 + trunk/arch/powerpc/configs/celleb_defconfig | 129 +- .../arch/powerpc/configs/prpmc2800_defconfig | 1442 ++++++ trunk/arch/powerpc/configs/ps3_defconfig | 167 +- trunk/arch/powerpc/kernel/audit.c | 17 + trunk/arch/powerpc/kernel/compat_audit.c | 5 + trunk/arch/powerpc/kernel/irq.c | 2 +- trunk/arch/powerpc/kernel/pci_64.c | 37 +- trunk/arch/powerpc/kernel/prom.c | 47 +- trunk/arch/powerpc/kernel/prom_parse.c | 2 +- trunk/arch/powerpc/kernel/setup-common.c | 41 + trunk/arch/powerpc/kernel/swsusp.c | 4 - trunk/arch/powerpc/kernel/time.c | 19 +- trunk/arch/powerpc/lib/Makefile | 2 - trunk/arch/powerpc/lib/rheap.c | 117 +- trunk/arch/powerpc/mm/hash_native_64.c | 39 +- .../arch/powerpc/platforms/83xx/mpc8313_rdb.c | 2 + .../arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 + .../arch/powerpc/platforms/83xx/mpc834x_itx.c | 2 + .../arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 + .../powerpc/platforms/86xx/mpc86xx_hpcn.c | 7 +- trunk/arch/powerpc/platforms/cell/pervasive.c | 6 +- trunk/arch/powerpc/platforms/celleb/pci.c | 1 + .../arch/powerpc/platforms/celleb/scc_epci.c | 8 +- trunk/arch/powerpc/platforms/celleb/setup.c | 2 +- .../powerpc/platforms/embedded6xx/Kconfig | 13 + .../powerpc/platforms/embedded6xx/Makefile | 1 + .../powerpc/platforms/embedded6xx/prpmc2800.c | 171 + trunk/arch/powerpc/platforms/pasemi/idle.c | 1 + trunk/arch/powerpc/platforms/ps3/setup.c | 2 +- trunk/arch/powerpc/platforms/ps3/smp.c | 6 +- trunk/arch/powerpc/platforms/ps3/system-bus.c | 6 +- trunk/arch/powerpc/platforms/pseries/eeh.c | 13 +- .../powerpc/platforms/pseries/eeh_driver.c | 7 +- trunk/arch/powerpc/platforms/pseries/iommu.c | 3 +- trunk/arch/powerpc/platforms/pseries/kexec.c | 1 + trunk/arch/powerpc/sysdev/Makefile | 2 + trunk/arch/powerpc/sysdev/commproc.c | 20 +- trunk/arch/powerpc/sysdev/cpm2_common.c | 21 +- trunk/arch/powerpc/sysdev/mv64x60.h | 11 + trunk/arch/powerpc/sysdev/mv64x60_dev.c | 422 ++ trunk/arch/powerpc/sysdev/mv64x60_pci.c | 172 + trunk/arch/powerpc/sysdev/mv64x60_pic.c | 305 ++ trunk/arch/powerpc/sysdev/qe_lib/qe.c | 29 +- trunk/arch/powerpc/sysdev/qe_lib/ucc_fast.c | 5 +- trunk/arch/powerpc/sysdev/qe_lib/ucc_slow.c | 7 +- trunk/arch/ppc/4xx_io/serial_sicc.c | 10 +- trunk/arch/ppc/8xx_io/commproc.c | 24 +- trunk/arch/ppc/8xx_io/fec.c | 2 +- trunk/arch/ppc/boot/lib/vreset.c | 2 +- trunk/arch/ppc/boot/simple/m8xx_tty.c | 2 +- trunk/arch/ppc/boot/simple/misc-embedded.c | 2 +- trunk/arch/ppc/boot/simple/mpc52xx_tty.c | 2 +- trunk/arch/ppc/boot/simple/mv64x60_tty.c | 2 +- trunk/arch/ppc/boot/simple/rw4/stb.h | 2 +- trunk/arch/ppc/kernel/traps.c | 4 +- trunk/arch/ppc/lib/Makefile | 3 - trunk/arch/ppc/lib/rheap.c | 692 --- trunk/arch/ppc/mm/init.c | 2 +- trunk/arch/ppc/platforms/4xx/bubinga.c | 2 +- trunk/arch/ppc/platforms/4xx/ep405.c | 2 +- trunk/arch/ppc/platforms/4xx/ibmnp405h.h | 2 +- trunk/arch/ppc/platforms/4xx/sycamore.c | 2 +- trunk/arch/ppc/platforms/4xx/walnut.c | 2 +- trunk/arch/ppc/platforms/ev64360.c | 2 +- trunk/arch/ppc/platforms/hdpu.c | 2 +- trunk/arch/ppc/platforms/katana.c | 2 +- trunk/arch/ppc/platforms/mbx.h | 2 +- trunk/arch/ppc/platforms/mvme5100.h | 2 +- trunk/arch/ppc/platforms/pplus.h | 2 +- trunk/arch/ppc/platforms/prep_pci.c | 22 +- trunk/arch/ppc/platforms/prep_setup.c | 6 +- trunk/arch/ppc/platforms/prpmc750.h | 2 +- trunk/arch/ppc/platforms/radstone_ppc7d.c | 2 +- trunk/arch/ppc/platforms/sandpoint.c | 8 +- trunk/arch/ppc/syslib/cpm2_common.c | 23 +- trunk/arch/ppc/syslib/harrier.c | 2 +- trunk/arch/ppc/syslib/hawk_common.c | 4 +- trunk/arch/ppc/syslib/m82xx_pci.c | 2 +- trunk/arch/ppc/syslib/mpc10x_common.c | 4 +- trunk/arch/ppc/syslib/mpc52xx_setup.c | 2 +- trunk/arch/ppc/syslib/mpc8xx_devices.c | 2 +- trunk/arch/ppc/syslib/mv64x60.c | 10 +- trunk/arch/ppc/syslib/ocp.c | 2 +- trunk/arch/ppc/syslib/ppc403_pic.c | 2 +- trunk/arch/ppc/syslib/ppc405_pci.c | 2 +- trunk/arch/ppc/syslib/ppc4xx_dma.c | 2 +- trunk/arch/ppc/syslib/ppc85xx_rio.c | 4 +- trunk/arch/ppc/syslib/xilinx_pic.c | 2 +- trunk/arch/s390/Kconfig | 49 +- trunk/arch/s390/defconfig | 234 +- trunk/arch/s390/hypfs/inode.c | 2 +- trunk/arch/s390/kernel/audit.c | 17 + trunk/arch/s390/kernel/compat_audit.c | 5 + trunk/arch/s390/kernel/ipl.c | 26 +- trunk/arch/s390/mm/fault.c | 5 +- trunk/arch/sparc/defconfig | 151 +- trunk/arch/sparc/kernel/auxio.c | 2 +- trunk/arch/sparc/kernel/head.S | 2 +- trunk/arch/sparc/kernel/ioport.c | 2 +- trunk/arch/sparc/kernel/irq.c | 8 +- trunk/arch/sparc/kernel/pcic.c | 4 +- trunk/arch/sparc/kernel/process.c | 2 +- trunk/arch/sparc/kernel/sun4d_irq.c | 2 +- trunk/arch/sparc/kernel/sun4m_irq.c | 2 +- trunk/arch/sparc/kernel/systbls.S | 5 +- trunk/arch/sparc/prom/printf.c | 2 +- trunk/arch/sparc64/Kconfig | 3 - trunk/arch/sparc64/defconfig | 142 +- trunk/arch/sparc64/kernel/audit.c | 17 + trunk/arch/sparc64/kernel/compat_audit.c | 5 + trunk/arch/sparc64/kernel/devices.c | 2 +- trunk/arch/sparc64/kernel/of_device.c | 11 +- trunk/arch/sparc64/kernel/pci.c | 6 +- trunk/arch/sparc64/kernel/pci_common.c | 194 + trunk/arch/sparc64/kernel/pci_fire.c | 137 +- trunk/arch/sparc64/kernel/pci_impl.h | 6 + trunk/arch/sparc64/kernel/pci_iommu.c | 2 +- trunk/arch/sparc64/kernel/pci_psycho.c | 119 +- trunk/arch/sparc64/kernel/pci_sabre.c | 288 +- trunk/arch/sparc64/kernel/pci_schizo.c | 122 +- trunk/arch/sparc64/kernel/pci_sun4v.c | 88 +- trunk/arch/sparc64/kernel/process.c | 2 +- trunk/arch/sparc64/kernel/prom.c | 21 +- trunk/arch/sparc64/kernel/smp.c | 3 + trunk/arch/sparc64/kernel/systbls.S | 7 +- trunk/arch/sparc64/kernel/time.c | 230 +- trunk/arch/sparc64/mm/init.c | 2 +- trunk/arch/um/Kconfig | 3 +- trunk/arch/um/defconfig | 2 +- trunk/arch/um/include/common-offsets.h | 2 + trunk/arch/um/include/kern_util.h | 3 + trunk/arch/um/include/os.h | 1 - trunk/arch/um/kernel/dyn.lds.S | 2 + trunk/arch/um/kernel/init_task.c | 30 +- trunk/arch/um/kernel/irq.c | 115 +- trunk/arch/um/kernel/skas/process.c | 4 + trunk/arch/um/kernel/tt/exec_kern.c | 2 +- trunk/arch/um/kernel/tt/process_kern.c | 2 +- trunk/arch/um/kernel/um_arch.c | 2 +- trunk/arch/um/kernel/uml.lds.S | 2 + trunk/arch/um/os-Linux/signal.c | 50 +- trunk/arch/um/os-Linux/skas/process.c | 13 +- trunk/arch/um/os-Linux/sys-i386/signal.c | 8 +- trunk/arch/um/os-Linux/sys-x86_64/signal.c | 6 +- trunk/arch/um/os-Linux/util.c | 23 +- trunk/arch/x86_64/ia32/audit.c | 5 + trunk/arch/x86_64/ia32/ia32entry.S | 5 +- trunk/arch/x86_64/kernel/aperture.c | 2 +- trunk/arch/x86_64/kernel/audit.c | 17 + trunk/arch/x86_64/kernel/bugs.c | 2 + trunk/arch/x86_64/kernel/head64.c | 7 - trunk/arch/x86_64/kernel/pci-gart.c | 2 +- trunk/arch/x86_64/kernel/setup.c | 4 +- trunk/arch/x86_64/kernel/traps.c | 2 - trunk/block/ll_rw_blk.c | 53 +- trunk/drivers/Makefile | 1 + trunk/drivers/acpi/dispatcher/dsmethod.c | 12 +- trunk/drivers/acpi/dispatcher/dsopcode.c | 3 +- trunk/drivers/acpi/dispatcher/dsutils.c | 7 +- trunk/drivers/acpi/dispatcher/dswstate.c | 9 +- trunk/drivers/acpi/ec.c | 39 +- trunk/drivers/acpi/events/evgpe.c | 5 +- trunk/drivers/acpi/events/evgpeblk.c | 3 +- trunk/drivers/acpi/events/evmisc.c | 20 +- trunk/drivers/acpi/events/evregion.c | 15 +- trunk/drivers/acpi/events/evrgnini.c | 3 +- trunk/drivers/acpi/events/evxface.c | 7 +- trunk/drivers/acpi/events/evxfevnt.c | 2 - trunk/drivers/acpi/executer/exconvrt.c | 5 +- trunk/drivers/acpi/executer/excreate.c | 6 +- trunk/drivers/acpi/executer/exdump.c | 17 +- trunk/drivers/acpi/executer/exmutex.c | 37 +- trunk/drivers/acpi/executer/exnames.c | 3 +- trunk/drivers/acpi/executer/exprep.c | 2 +- trunk/drivers/acpi/executer/exresop.c | 3 +- trunk/drivers/acpi/executer/exsystem.c | 30 +- trunk/drivers/acpi/executer/exutils.c | 104 +- trunk/drivers/acpi/hardware/hwsleep.c | 1 - trunk/drivers/acpi/namespace/nseval.c | 13 +- trunk/drivers/acpi/namespace/nsinit.c | 7 +- trunk/drivers/acpi/namespace/nswalk.c | 6 +- trunk/drivers/acpi/namespace/nsxfeval.c | 17 +- trunk/drivers/acpi/osl.c | 45 +- trunk/drivers/acpi/parser/psopcode.c | 618 ++- trunk/drivers/acpi/resources/rscalc.c | 3 +- trunk/drivers/acpi/resources/rscreate.c | 13 +- trunk/drivers/acpi/resources/rsdump.c | 8 +- trunk/drivers/acpi/resources/rsinfo.c | 2 +- trunk/drivers/acpi/resources/rslist.c | 7 +- trunk/drivers/acpi/resources/rsmisc.c | 4 +- trunk/drivers/acpi/resources/rsutils.c | 6 +- trunk/drivers/acpi/resources/rsxface.c | 3 - trunk/drivers/acpi/sleep/main.c | 3 +- trunk/drivers/acpi/sleep/proc.c | 11 +- trunk/drivers/acpi/tables/tbfadt.c | 6 +- trunk/drivers/acpi/tables/tbxface.c | 16 +- trunk/drivers/acpi/thermal.c | 104 +- trunk/drivers/acpi/utilities/utalloc.c | 1 - trunk/drivers/acpi/utilities/utcache.c | 3 +- trunk/drivers/acpi/utilities/utcopy.c | 4 +- trunk/drivers/acpi/utilities/utdebug.c | 4 +- trunk/drivers/acpi/utilities/utdelete.c | 1 + trunk/drivers/acpi/utilities/utglobal.c | 6 +- trunk/drivers/acpi/utilities/utmisc.c | 6 +- trunk/drivers/acpi/utilities/utmutex.c | 8 +- trunk/drivers/acpi/utilities/utresrc.c | 1 - trunk/drivers/acpi/utilities/utxface.c | 2 - trunk/drivers/ata/Kconfig | 37 +- trunk/drivers/ata/Makefile | 2 +- trunk/drivers/ata/ahci.c | 5 +- trunk/drivers/ata/ata_generic.c | 12 +- trunk/drivers/ata/ata_piix.c | 8 +- trunk/drivers/ata/libata-acpi.c | 192 +- trunk/drivers/ata/libata-core.c | 72 +- trunk/drivers/ata/libata-eh.c | 246 +- trunk/drivers/ata/libata-scsi.c | 157 +- trunk/drivers/ata/libata-sff.c | 162 +- trunk/drivers/ata/libata.h | 7 +- trunk/drivers/ata/pata_ali.c | 36 +- trunk/drivers/ata/pata_amd.c | 13 +- trunk/drivers/ata/pata_artop.c | 25 +- trunk/drivers/ata/pata_atiixp.c | 10 +- trunk/drivers/ata/pata_cmd640.c | 11 +- trunk/drivers/ata/pata_cmd64x.c | 17 +- trunk/drivers/ata/pata_cs5520.c | 4 - trunk/drivers/ata/pata_cs5530.c | 14 +- trunk/drivers/ata/pata_cs5535.c | 10 +- trunk/drivers/ata/pata_cypress.c | 10 +- trunk/drivers/ata/pata_efar.c | 10 +- trunk/drivers/ata/pata_hpt366.c | 17 +- trunk/drivers/ata/pata_hpt37x.c | 33 +- trunk/drivers/ata/pata_hpt3x2n.c | 13 +- trunk/drivers/ata/pata_hpt3x3.c | 10 +- trunk/drivers/ata/pata_icside.c | 184 +- trunk/drivers/ata/pata_it8213.c | 12 +- trunk/drivers/ata/pata_it821x.c | 16 +- trunk/drivers/ata/pata_ixp4xx_cf.c | 2 +- trunk/drivers/ata/pata_jmicron.c | 10 +- trunk/drivers/ata/pata_marvell.c | 15 +- trunk/drivers/ata/pata_mpc52xx.c | 4 - trunk/drivers/ata/pata_mpiix.c | 4 - trunk/drivers/ata/pata_netcell.c | 10 +- trunk/drivers/ata/pata_ns87410.c | 10 +- trunk/drivers/ata/pata_oldpiix.c | 10 +- trunk/drivers/ata/pata_opti.c | 10 +- trunk/drivers/ata/pata_optidma.c | 16 +- trunk/drivers/ata/pata_pcmcia.c | 1 + trunk/drivers/ata/pata_pdc202xx_old.c | 12 +- trunk/drivers/ata/pata_platform.c | 4 +- trunk/drivers/ata/pata_radisys.c | 10 +- trunk/drivers/ata/pata_rz1000.c | 18 +- trunk/drivers/ata/pata_sc1200.c | 12 +- trunk/drivers/ata/pata_scc.c | 4 - trunk/drivers/ata/pata_serverworks.c | 19 +- trunk/drivers/ata/pata_sil680.c | 14 +- trunk/drivers/ata/pata_sis.c | 33 +- trunk/drivers/ata/pata_sl82c105.c | 17 +- trunk/drivers/ata/pata_triflex.c | 10 +- trunk/drivers/ata/pata_via.c | 36 +- trunk/drivers/ata/sata_inic162x.c | 4 - trunk/drivers/ata/sata_nv.c | 16 +- trunk/drivers/ata/sata_sil.c | 4 - trunk/drivers/ata/sata_sil24.c | 4 - trunk/drivers/ata/sata_sis.c | 6 +- trunk/drivers/ata/sata_uli.c | 22 +- trunk/drivers/ata/sata_via.c | 6 +- trunk/drivers/ata/sis.h | 2 +- trunk/drivers/atm/Kconfig | 32 +- trunk/drivers/auxdisplay/Kconfig | 1 + trunk/drivers/block/Kconfig | 4 +- trunk/drivers/block/loop.c | 47 +- trunk/drivers/bluetooth/hci_ldisc.c | 10 +- trunk/drivers/bluetooth/hci_uart.h | 5 +- trunk/drivers/char/Kconfig | 11 +- trunk/drivers/char/agp/amd64-agp.c | 2 +- trunk/drivers/char/ipmi/Kconfig | 2 + trunk/drivers/char/ipmi/ipmi_si_intf.c | 8 +- trunk/drivers/char/ipmi/ipmi_watchdog.c | 134 +- trunk/drivers/char/n_tty.c | 29 +- trunk/drivers/char/rio/riocmd.c | 2 +- trunk/drivers/char/rocket.c | 3 - trunk/drivers/char/rocket_int.h | 2 - trunk/drivers/char/snsc_event.c | 2 - trunk/drivers/char/synclink_gt.c | 107 + trunk/drivers/char/tpm/Kconfig | 1 + trunk/drivers/char/tpm/tpm_atmel.h | 3 + trunk/drivers/char/tty_io.c | 77 +- trunk/drivers/char/watchdog/Kconfig | 150 +- trunk/drivers/char/watchdog/Makefile | 2 +- trunk/drivers/char/watchdog/cpu5wdt.c | 14 +- trunk/drivers/char/watchdog/eurotechwdt.c | 22 +- trunk/drivers/char/watchdog/i8xx_tco.c | 571 --- trunk/drivers/char/watchdog/i8xx_tco.h | 42 - trunk/drivers/char/watchdog/iTCO_wdt.c | 2 +- trunk/drivers/char/watchdog/ibmasr.c | 11 +- trunk/drivers/char/watchdog/machzwd.c | 18 +- trunk/drivers/char/watchdog/mtx-1_wdt.c | 238 + trunk/drivers/char/watchdog/pcwd.c | 242 +- trunk/drivers/char/watchdog/pcwd_usb.c | 8 +- trunk/drivers/char/watchdog/s3c2410_wdt.c | 6 +- trunk/drivers/char/watchdog/sbc8360.c | 28 +- trunk/drivers/char/watchdog/w83627hf_wdt.c | 23 +- trunk/drivers/crypto/Kconfig | 22 + trunk/drivers/dma/Kconfig | 1 + trunk/drivers/edac/Kconfig | 1 + trunk/drivers/firewire/Kconfig | 61 + trunk/drivers/firewire/Makefile | 10 + trunk/drivers/firewire/fw-card.c | 560 +++ trunk/drivers/firewire/fw-cdev.c | 961 ++++ trunk/drivers/firewire/fw-device.c | 813 ++++ trunk/drivers/firewire/fw-device.h | 146 + trunk/drivers/firewire/fw-iso.c | 163 + trunk/drivers/firewire/fw-ohci.c | 1943 ++++++++ trunk/drivers/firewire/fw-ohci.h | 153 + trunk/drivers/firewire/fw-sbp2.c | 1147 +++++ trunk/drivers/firewire/fw-topology.c | 537 +++ trunk/drivers/firewire/fw-topology.h | 92 + trunk/drivers/firewire/fw-transaction.c | 910 ++++ trunk/drivers/firewire/fw-transaction.h | 458 ++ trunk/drivers/hid/hid-input.c | 101 +- trunk/drivers/hid/usbhid/Kconfig | 4 +- trunk/drivers/hid/usbhid/hid-core.c | 41 +- trunk/drivers/hid/usbhid/hid-lgff.c | 2 +- trunk/drivers/hid/usbhid/hid-plff.c | 2 +- trunk/drivers/hid/usbhid/hid-quirks.c | 7 + trunk/drivers/hid/usbhid/hid-tmff.c | 2 +- trunk/drivers/hid/usbhid/hid-zpff.c | 2 +- trunk/drivers/hid/usbhid/hiddev.c | 14 + trunk/drivers/hid/usbhid/usbkbd.c | 21 +- trunk/drivers/hid/usbhid/usbmouse.c | 9 +- trunk/drivers/hwmon/Kconfig | 1 + trunk/drivers/hwmon/ams/ams-input.c | 2 +- trunk/drivers/hwmon/applesmc.c | 2 +- trunk/drivers/hwmon/hdaps.c | 2 +- trunk/drivers/i2c/Kconfig | 1 + trunk/drivers/i2c/busses/i2c-at91.c | 7 +- trunk/drivers/i2c/busses/i2c-pxa.c | 2 +- trunk/drivers/ide/Kconfig | 1 + trunk/drivers/ide/arm/icside.c | 41 +- trunk/drivers/ide/arm/rapide.c | 5 +- trunk/drivers/ieee1394/Kconfig | 3 + trunk/drivers/infiniband/Kconfig | 1 + trunk/drivers/input/Kconfig | 1 + trunk/drivers/input/evdev.c | 2 +- trunk/drivers/input/misc/ixp4xx-beeper.c | 2 +- trunk/drivers/isdn/Kconfig | 1 + trunk/drivers/kvm/Kconfig | 1 + trunk/drivers/leds/Kconfig | 1 + trunk/drivers/md/md.c | 2 +- trunk/drivers/md/raid1.c | 33 +- trunk/drivers/media/Kconfig | 10 + trunk/drivers/media/Makefile | 2 +- trunk/drivers/media/common/saa7146_core.c | 54 +- trunk/drivers/media/common/saa7146_fops.c | 1 - trunk/drivers/media/dvb/Kconfig | 24 +- trunk/drivers/media/dvb/dvb-core/Kconfig | 14 +- trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 5 + trunk/drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- trunk/drivers/media/dvb/dvb-usb/m920x.c | 565 ++- trunk/drivers/media/dvb/dvb-usb/m920x.h | 13 +- trunk/drivers/media/dvb/dvb-usb/vp702x-fe.c | 14 +- trunk/drivers/media/dvb/pluto2/pluto2.c | 8 + trunk/drivers/media/dvb/ttpci/av7110.c | 9 +- trunk/drivers/media/dvb/ttpci/budget-ci.c | 2 +- trunk/drivers/media/dvb/ttpci/budget-core.c | 37 +- trunk/drivers/media/radio/Kconfig | 11 +- trunk/drivers/media/radio/dsbr100.c | 345 +- trunk/drivers/media/radio/radio-cadet.c | 297 +- trunk/drivers/media/radio/radio-maestro.c | 3 - trunk/drivers/media/radio/radio-zoltrix.c | 1 - trunk/drivers/media/video/Kconfig | 45 +- .../media/video/cx25840/cx25840-core.c | 4 +- trunk/drivers/media/video/cx88/cx88-mpeg.c | 5 +- trunk/drivers/media/video/cx88/cx88-video.c | 1 + .../media/video/cx88/cx88-vp3054-i2c.c | 7 - .../media/video/cx88/cx88-vp3054-i2c.h | 1 - trunk/drivers/media/video/em28xx/Kconfig | 2 +- trunk/drivers/media/video/et61x251/Kconfig | 2 +- trunk/drivers/media/video/ivtv/ivtv-driver.c | 2 +- trunk/drivers/media/video/ivtv/ivtv-fileops.c | 2 +- trunk/drivers/media/video/pvrusb2/Kconfig | 2 +- .../media/video/pvrusb2/pvrusb2-encoder.c | 13 +- .../drivers/media/video/pvrusb2/pvrusb2-hdw.c | 10 +- .../media/video/pvrusb2/pvrusb2-i2c-core.c | 23 +- .../media/video/pvrusb2/pvrusb2-sysfs.c | 14 - trunk/drivers/media/video/pwc/Kconfig | 2 +- .../media/video/saa7134/saa7134-cards.c | 123 +- .../drivers/media/video/saa7134/saa7134-dvb.c | 17 + trunk/drivers/media/video/saa7134/saa7134.h | 3 + trunk/drivers/media/video/sn9c102/Kconfig | 2 +- trunk/drivers/media/video/sn9c102/sn9c102.h | 2 +- .../media/video/sn9c102/sn9c102_core.c | 91 +- .../media/video/sn9c102/sn9c102_devtable.h | 4 +- .../media/video/sn9c102/sn9c102_hv7131d.c | 6 +- .../media/video/sn9c102/sn9c102_hv7131r.c | 8 +- .../media/video/sn9c102/sn9c102_mi0343.c | 51 +- .../media/video/sn9c102/sn9c102_mi0360.c | 220 +- .../media/video/sn9c102/sn9c102_ov7630.c | 25 +- .../media/video/sn9c102/sn9c102_ov7660.c | 63 +- .../media/video/sn9c102/sn9c102_pas106b.c | 14 +- .../media/video/sn9c102/sn9c102_pas202bcb.c | 48 +- .../media/video/sn9c102/sn9c102_sensor.h | 33 +- .../media/video/sn9c102/sn9c102_tas5110c1b.c | 2 +- .../media/video/sn9c102/sn9c102_tas5110d.c | 2 +- .../media/video/sn9c102/sn9c102_tas5130d1b.c | 2 +- trunk/drivers/media/video/usbvideo/Kconfig | 8 +- trunk/drivers/media/video/usbvision/Kconfig | 2 +- trunk/drivers/media/video/v4l1-compat.c | 62 +- trunk/drivers/media/video/video-buf.c | 4 +- trunk/drivers/media/video/videodev.c | 50 +- trunk/drivers/media/video/zc0301/Kconfig | 2 +- trunk/drivers/message/fusion/Kconfig | 1 + trunk/drivers/message/i2o/Kconfig | 1 + trunk/drivers/mfd/Kconfig | 1 + trunk/drivers/misc/Kconfig | 2 +- trunk/drivers/misc/asus-laptop.c | 66 +- trunk/drivers/misc/msi-laptop.c | 12 +- trunk/drivers/misc/sony-laptop.c | 8 +- trunk/drivers/mmc/Kconfig | 1 + trunk/drivers/mmc/card/block.c | 17 +- trunk/drivers/mmc/host/au1xmmc.c | 35 +- trunk/drivers/mmc/host/pxamci.c | 18 +- trunk/drivers/mmc/host/sdhci.c | 9 + trunk/drivers/mtd/Kconfig | 1 + trunk/drivers/net/Kconfig | 18 +- trunk/drivers/net/arm/ether1.c | 6 +- trunk/drivers/net/arm/ether3.c | 6 +- trunk/drivers/net/arm/etherh.c | 17 +- trunk/drivers/net/fs_enet/mac-scc.c | 2 +- trunk/drivers/net/irda/Kconfig | 14 + trunk/drivers/net/irda/Makefile | 1 + trunk/drivers/net/irda/kingsun-sir.c | 657 +++ trunk/drivers/net/mlx4/eq.c | 2 +- trunk/drivers/net/netxen/netxen_nic_main.c | 2 +- trunk/drivers/net/pcmcia/Kconfig | 23 +- trunk/drivers/net/phy/Kconfig | 21 +- trunk/drivers/net/phy/davicom.c | 34 +- trunk/drivers/net/s2io.c | 368 +- trunk/drivers/net/s2io.h | 32 + trunk/drivers/net/sgiseeq.c | 83 +- trunk/drivers/net/skge.c | 9 + trunk/drivers/net/sky2.c | 53 +- trunk/drivers/net/spider_net.c | 8 +- trunk/drivers/net/ucc_geth.c | 30 +- trunk/drivers/net/wan/Kconfig | 34 +- trunk/drivers/net/wireless/Kconfig | 1 + trunk/drivers/net/wireless/libertas/Makefile | 9 - trunk/drivers/net/wireless/libertas/README | 516 --- trunk/drivers/net/wireless/libertas/assoc.c | 41 +- trunk/drivers/net/wireless/libertas/cmd.c | 23 +- trunk/drivers/net/wireless/libertas/cmdresp.c | 4 +- trunk/drivers/net/wireless/libertas/debugfs.c | 31 +- trunk/drivers/net/wireless/libertas/defs.h | 52 +- trunk/drivers/net/wireless/libertas/dev.h | 14 +- trunk/drivers/net/wireless/libertas/fw.c | 9 +- trunk/drivers/net/wireless/libertas/if_usb.c | 5 +- trunk/drivers/net/wireless/libertas/if_usb.h | 2 - trunk/drivers/net/wireless/libertas/ioctl.c | 1563 +------ trunk/drivers/net/wireless/libertas/join.c | 194 +- trunk/drivers/net/wireless/libertas/join.h | 7 - trunk/drivers/net/wireless/libertas/main.c | 7 + trunk/drivers/net/wireless/libertas/rx.c | 4 +- trunk/drivers/net/wireless/libertas/scan.c | 203 +- trunk/drivers/net/wireless/libertas/scan.h | 22 +- trunk/drivers/net/wireless/libertas/tx.c | 2 +- trunk/drivers/net/wireless/libertas/version.h | 7 - trunk/drivers/net/wireless/libertas/wext.c | 448 +- trunk/drivers/net/wireless/libertas/wext.h | 85 - trunk/drivers/parport/Kconfig | 1 + trunk/drivers/pci/hotplug/sgi_hotplug.c | 36 +- trunk/drivers/pci/msi.c | 6 +- trunk/drivers/pci/quirks.c | 1 + trunk/drivers/pnp/Kconfig | 1 + trunk/drivers/rtc/Kconfig | 5 +- trunk/drivers/rtc/rtc-rs5c313.c | 28 +- trunk/drivers/s390/block/Kconfig | 11 +- trunk/drivers/s390/block/dasd.c | 8 +- trunk/drivers/s390/block/dasd_diag.c | 10 +- trunk/drivers/s390/block/dasd_eckd.c | 6 +- trunk/drivers/s390/block/dasd_ioctl.c | 4 +- trunk/drivers/s390/{ => char}/Kconfig | 111 +- trunk/drivers/s390/char/monreader.c | 14 +- trunk/drivers/s390/char/raw3270.c | 5 +- trunk/drivers/s390/char/sclp.h | 3 + trunk/drivers/s390/char/sclp_sdias.c | 8 +- trunk/drivers/s390/char/zcore.c | 9 +- trunk/drivers/s390/cio/css.c | 3 +- trunk/drivers/s390/cio/css.h | 2 - trunk/drivers/s390/cio/device.c | 4 +- trunk/drivers/s390/cio/device_ops.c | 11 + trunk/drivers/s390/cio/qdio.c | 1 + trunk/drivers/s390/net/Kconfig | 8 +- trunk/drivers/s390/net/qeth_mpc.c | 4 +- trunk/drivers/s390/scsi/zfcp_aux.c | 8 +- trunk/drivers/s390/scsi/zfcp_dbf.c | 2 +- trunk/drivers/sbus/char/bbc_i2c.c | 1 + trunk/drivers/sbus/char/display7seg.c | 1 + trunk/drivers/sbus/char/envctrl.c | 1 + trunk/drivers/scsi/Kconfig | 8 + trunk/drivers/scsi/arm/arxescsi.c | 12 +- trunk/drivers/scsi/arm/cumana_2.c | 16 +- trunk/drivers/scsi/arm/eesox.c | 16 +- trunk/drivers/scsi/arm/powertec.c | 16 +- trunk/drivers/scsi/sgiwd93.c | 264 +- trunk/drivers/serial/8250_acorn.c | 3 +- trunk/drivers/serial/Kconfig | 18 + trunk/drivers/serial/Makefile | 1 + trunk/drivers/serial/cpm_uart/cpm_uart.h | 2 +- trunk/drivers/serial/cpm_uart/cpm_uart_core.c | 3 +- trunk/drivers/serial/cpm_uart/cpm_uart_cpm1.c | 6 +- trunk/drivers/serial/cpm_uart/cpm_uart_cpm2.c | 6 +- trunk/drivers/serial/serial_ks8695.c | 657 +++ trunk/drivers/serial/sunhv.c | 4 + trunk/drivers/serial/sunzilog.c | 138 +- trunk/drivers/serial/sunzilog.h | 19 +- trunk/drivers/spi/Kconfig | 8 + trunk/drivers/spi/Makefile | 1 + trunk/drivers/spi/mpc52xx_psc_spi.c | 654 +++ trunk/drivers/telephony/Kconfig | 1 + trunk/drivers/usb/Kconfig | 1 + trunk/drivers/usb/gadget/Kconfig | 2 +- trunk/drivers/video/Kconfig | 39 +- trunk/drivers/video/Makefile | 1 + trunk/drivers/video/atmel_lcdfb.c | 752 +++ trunk/drivers/video/console/Kconfig | 7 - trunk/drivers/video/nvidia/nv_hw.c | 4 +- trunk/drivers/video/nvidia/nvidia.c | 1 - trunk/drivers/video/pm2fb.c | 38 +- trunk/drivers/video/pm3fb.c | 4013 +++-------------- trunk/drivers/video/riva/rivafb-i2c.c | 2 - trunk/drivers/w1/Kconfig | 1 + trunk/fs/Makefile | 4 + trunk/fs/afs/afs.h | 23 + trunk/fs/afs/afs_fs.h | 5 +- trunk/fs/afs/dir.c | 18 +- trunk/fs/afs/file.c | 2 +- trunk/fs/afs/fsclient.c | 515 ++- trunk/fs/afs/inode.c | 10 +- trunk/fs/afs/internal.h | 6 + trunk/fs/afs/rxrpc.c | 2 +- trunk/fs/afs/super.c | 44 +- trunk/fs/afs/vnode.c | 85 +- trunk/fs/afs/write.c | 23 +- trunk/fs/aio.c | 28 +- trunk/fs/anon_inodes.c | 200 + trunk/fs/autofs/autofs_i.h | 4 +- trunk/fs/autofs/inode.c | 47 +- trunk/fs/autofs/root.c | 83 +- trunk/fs/autofs4/inode.c | 16 +- trunk/fs/autofs4/root.c | 18 +- trunk/fs/compat.c | 49 + trunk/fs/compat_ioctl.c | 5 +- trunk/fs/eventfd.c | 228 + trunk/fs/eventpoll.c | 1627 +++---- trunk/fs/exec.c | 15 +- trunk/fs/locks.c | 5 +- trunk/fs/mpage.c | 174 +- trunk/fs/namei.c | 2 +- trunk/fs/ntfs/aops.c | 36 +- trunk/fs/ntfs/file.c | 59 +- trunk/fs/ocfs2/cluster/masklog.c | 5 +- trunk/fs/partitions/Kconfig | 2 +- trunk/fs/partitions/efi.c | 12 +- trunk/fs/signalfd.c | 349 ++ trunk/fs/timerfd.c | 227 + trunk/fs/xattr.c | 2 + trunk/include/acpi/acdispat.h | 9 +- trunk/include/acpi/acglobal.h | 2 +- trunk/include/acpi/acinterp.h | 9 +- trunk/include/acpi/aclocal.h | 2 +- trunk/include/acpi/acnamesp.h | 6 +- trunk/include/acpi/acobject.h | 4 +- trunk/include/acpi/acpi_bus.h | 9 +- trunk/include/acpi/acpi_drivers.h | 6 +- trunk/include/acpi/acpi_numa.h | 2 +- trunk/include/acpi/acpiosxf.h | 3 +- trunk/include/acpi/actypes.h | 2 +- trunk/include/acpi/acutils.h | 3 +- trunk/include/acpi/platform/aclinux.h | 21 +- trunk/include/acpi/processor.h | 18 +- trunk/include/asm-alpha/mmu_context.h | 2 +- trunk/include/asm-alpha/poll.h | 26 +- trunk/include/asm-arm/arch-at91/at91sam9rl.h | 110 + .../asm-arm/arch-at91/at91sam9rl_matrix.h | 96 + trunk/include/asm-arm/arch-at91/cpu.h | 9 + trunk/include/asm-arm/arch-at91/hardware.h | 19 +- trunk/include/asm-arm/arch-at91/io.h | 18 + trunk/include/asm-arm/arch-at91/irqs.h | 1 + trunk/include/asm-arm/arch-at91/timex.h | 5 + trunk/include/asm-arm/arch-at91/uncompress.h | 2 +- .../include/asm-arm/arch-cl7500/entry-macro.S | 8 + trunk/include/asm-arm/arch-davinci/common.h | 19 + .../asm-arm/arch-davinci/debug-macro.S | 21 + trunk/include/asm-arm/arch-davinci/dma.h | 16 + .../asm-arm/arch-davinci/entry-macro.S | 32 + trunk/include/asm-arm/arch-davinci/hardware.h | 14 + trunk/include/asm-arm/arch-davinci/io.h | 79 + trunk/include/asm-arm/arch-davinci/irqs.h | 105 + trunk/include/asm-arm/arch-davinci/memory.h | 64 + trunk/include/asm-arm/arch-davinci/psc.h | 76 + trunk/include/asm-arm/arch-davinci/serial.h | 20 + trunk/include/asm-arm/arch-davinci/system.h | 29 + trunk/include/asm-arm/arch-davinci/timex.h | 17 + .../include/asm-arm/arch-davinci/uncompress.h | 35 + trunk/include/asm-arm/arch-davinci/vmalloc.h | 15 + .../asm-arm/arch-ebsa110/entry-macro.S | 2 +- .../asm-arm/arch-ebsa285/entry-macro.S | 16 +- trunk/include/asm-arm/arch-iop13xx/io.h | 2 +- trunk/include/asm-arm/arch-iop13xx/iop13xx.h | 29 + trunk/include/asm-arm/arch-iop13xx/irqs.h | 8 +- trunk/include/asm-arm/arch-iop13xx/msi.h | 11 + trunk/include/asm-arm/arch-iop32x/io.h | 2 +- trunk/include/asm-arm/arch-iop33x/io.h | 2 +- .../include/asm-arm/arch-ks8695/debug-macro.S | 38 + trunk/include/asm-arm/arch-ks8695/devices.h | 32 + trunk/include/asm-arm/arch-ks8695/dma.h | 17 + .../include/asm-arm/arch-ks8695/entry-macro.S | 53 + trunk/include/asm-arm/arch-ks8695/hardware.h | 49 + trunk/include/asm-arm/arch-ks8695/io.h | 19 + trunk/include/asm-arm/arch-ks8695/irqs.h | 54 + trunk/include/asm-arm/arch-ks8695/memory.h | 49 + trunk/include/asm-arm/arch-ks8695/regs-gpio.h | 53 + trunk/include/asm-arm/arch-ks8695/regs-hpna.h | 25 + trunk/include/asm-arm/arch-ks8695/regs-irq.h | 41 + trunk/include/asm-arm/arch-ks8695/regs-lan.h | 65 + trunk/include/asm-arm/arch-ks8695/regs-mem.h | 89 + trunk/include/asm-arm/arch-ks8695/regs-misc.h | 97 + trunk/include/asm-arm/arch-ks8695/regs-pci.h | 53 + .../include/asm-arm/arch-ks8695/regs-switch.h | 66 + trunk/include/asm-arm/arch-ks8695/regs-sys.h | 34 + .../include/asm-arm/arch-ks8695/regs-timer.h | 40 + trunk/include/asm-arm/arch-ks8695/regs-uart.h | 92 + trunk/include/asm-arm/arch-ks8695/regs-wan.h | 65 + trunk/include/asm-arm/arch-ks8695/system.h | 48 + trunk/include/asm-arm/arch-ks8695/timex.h | 20 + .../include/asm-arm/arch-ks8695/uncompress.h | 37 + trunk/include/asm-arm/arch-ks8695/vmalloc.h | 19 + trunk/include/asm-arm/arch-omap/mux.h | 31 +- .../asm-arm/arch-realview/entry-macro.S | 2 +- trunk/include/asm-arm/arch-rpc/entry-macro.S | 8 + .../asm-arm/arch-s3c2410/regs-s3c2443-clock.h | 1 + .../include/asm-arm/arch-sa1100/entry-macro.S | 8 +- .../asm-arm/arch-versatile/entry-macro.S | 2 +- trunk/include/asm-arm/ecard.h | 8 +- .../asm-arm/hardware/entry-macro-iomd.S | 28 +- trunk/include/asm-arm/poll.h | 28 +- trunk/include/asm-arm/sizes.h | 4 + trunk/include/asm-arm26/poll.h | 22 +- trunk/include/asm-avr32/arch-at32ap/cpu.h | 1 + trunk/include/asm-avr32/poll.h | 28 +- trunk/include/asm-cris/poll.h | 27 +- trunk/include/asm-frv/poll.h | 18 +- trunk/include/asm-generic/Kbuild | 1 + trunk/include/asm-generic/audit_signal.h | 3 + trunk/include/asm-generic/poll.h | 37 + trunk/include/asm-h8300/atomic.h | 1 + trunk/include/asm-h8300/poll.h | 18 +- trunk/include/asm-h8300/unistd.h | 66 +- trunk/include/asm-i386/alternative.h | 6 + trunk/include/asm-i386/kdebug.h | 1 - trunk/include/asm-i386/paravirt.h | 5 - trunk/include/asm-i386/pgalloc.h | 2 - trunk/include/asm-i386/pgtable.h | 5 +- trunk/include/asm-i386/poll.h | 28 +- trunk/include/asm-i386/processor.h | 4 + trunk/include/asm-i386/tsc.h | 6 +- trunk/include/asm-i386/unistd.h | 5 +- trunk/include/asm-ia64/irq.h | 6 + trunk/include/asm-ia64/kprobes.h | 4 +- trunk/include/asm-ia64/pgalloc.h | 82 +- trunk/include/asm-ia64/poll.h | 33 +- trunk/include/asm-ia64/unistd.h | 4 +- trunk/include/asm-m32r/pgtable-2level.h | 4 +- trunk/include/asm-m32r/pgtable.h | 2 +- trunk/include/asm-m32r/poll.h | 33 +- trunk/include/asm-m32r/system.h | 11 + trunk/include/asm-m68k/atarihw.h | 2 +- trunk/include/asm-m68k/atariints.h | 2 +- trunk/include/asm-m68k/poll.h | 17 +- trunk/include/asm-m68k/uaccess.h | 4 +- trunk/include/asm-mips/atomic.h | 2 +- trunk/include/asm-mips/bootinfo.h | 4 +- trunk/include/asm-mips/fpu.h | 23 +- trunk/include/asm-mips/hazards.h | 32 + trunk/include/asm-mips/highmem.h | 42 - trunk/include/asm-mips/mach-cobalt/cobalt.h | 2 + .../asm-mips/mach-ja/cpu-feature-overrides.h | 45 - trunk/include/asm-mips/mach-ja/spaces.h | 20 - trunk/include/asm-mips/mips-boards/malta.h | 4 + trunk/include/asm-mips/msc01_ic.h | 5 +- trunk/include/asm-mips/page.h | 4 - trunk/include/asm-mips/poll.h | 21 +- trunk/include/asm-mips/serial.h | 41 - trunk/include/asm-mips/sgi/seeq.h | 21 + trunk/include/asm-mips/sgi/wd.h | 20 + trunk/include/asm-mips/system.h | 5 +- trunk/include/asm-parisc/poll.h | 28 +- trunk/include/asm-powerpc/hw_irq.h | 11 +- trunk/include/asm-powerpc/mmu-hash64.h | 12 +- trunk/include/asm-powerpc/mmzone.h | 4 - trunk/include/asm-powerpc/poll.h | 25 +- trunk/include/asm-powerpc/ppc-pci.h | 18 +- trunk/include/asm-powerpc/ps3.h | 5 + trunk/include/asm-powerpc/qe.h | 13 +- trunk/include/asm-powerpc/reg_booke.h | 469 ++ .../include/{asm-ppc => asm-powerpc}/rheap.h | 20 +- trunk/include/asm-powerpc/systbl.h | 1 + trunk/include/asm-powerpc/unistd.h | 3 +- trunk/include/asm-ppc/commproc.h | 13 +- trunk/include/asm-ppc/cpm2.h | 13 +- trunk/include/asm-s390/ccwdev.h | 3 +- trunk/include/asm-s390/ipl.h | 2 +- trunk/include/asm-s390/param.h | 2 +- trunk/include/asm-s390/poll.h | 36 +- trunk/include/asm-sh/poll.h | 28 +- trunk/include/asm-sh64/poll.h | 33 +- trunk/include/asm-sparc/kdebug.h | 8 +- trunk/include/asm-sparc/poll.h | 14 +- trunk/include/asm-sparc/system.h | 1 + trunk/include/asm-sparc/unistd.h | 5 +- trunk/include/asm-sparc64/dma-mapping.h | 44 +- trunk/include/asm-sparc64/openprom.h | 2 +- trunk/include/asm-sparc64/poll.h | 14 +- trunk/include/asm-sparc64/unistd.h | 5 +- trunk/include/asm-um/thread_info.h | 2 + trunk/include/asm-v850/poll.h | 17 +- trunk/include/asm-x86_64/alternative.h | 6 + trunk/include/asm-x86_64/kdebug.h | 1 - trunk/include/asm-x86_64/page.h | 9 + trunk/include/asm-x86_64/poll.h | 28 +- trunk/include/asm-x86_64/unistd.h | 9 + trunk/include/asm-xtensa/poll.h | 20 +- trunk/include/linux/Kbuild | 3 +- trunk/include/linux/acpi.h | 3 +- trunk/include/linux/aio.h | 6 + trunk/include/linux/aio_abi.h | 18 +- trunk/include/linux/anon_inodes.h | 16 + trunk/include/linux/audit.h | 21 +- trunk/include/linux/compat.h | 11 + trunk/include/linux/crc-itu-t.h | 28 + trunk/include/linux/eventfd.h | 29 + trunk/include/linux/firewire-cdev.h | 229 + trunk/include/linux/firewire-constants.h | 67 + trunk/include/linux/genhd.h | 6 +- trunk/include/linux/hid.h | 1 + trunk/include/linux/i2c-id.h | 1 + trunk/include/linux/init.h | 7 +- trunk/include/linux/init_task.h | 32 +- trunk/include/linux/interrupt.h | 10 + trunk/include/linux/io.h | 8 + trunk/include/linux/kernel.h | 25 +- trunk/include/linux/libata.h | 31 +- trunk/include/linux/list.h | 8 +- trunk/include/linux/magic.h | 1 + trunk/include/linux/major.h | 2 + trunk/include/linux/mm_types.h | 7 +- trunk/include/linux/module.h | 2 +- trunk/include/linux/mpage.h | 1 - trunk/include/linux/netdevice.h | 2 + trunk/include/linux/netfilter/x_tables.h | 8 + .../include/linux/netfilter_arp/arp_tables.h | 41 + .../include/linux/netfilter_ipv4/ip_tables.h | 22 + .../include/linux/netfilter_ipv6/ip6_tables.h | 22 + trunk/include/linux/pci_ids.h | 1 + trunk/include/linux/pid.h | 5 +- trunk/include/linux/pmu.h | 2 +- trunk/include/linux/sched.h | 6 + trunk/include/linux/serial_core.h | 4 + trunk/include/linux/signal.h | 1 + trunk/include/linux/signalfd.h | 97 + trunk/include/linux/slub_def.h | 6 +- trunk/include/linux/synclink.h | 24 + trunk/include/linux/syscalls.h | 4 + trunk/include/linux/task_io_accounting_ops.h | 28 + trunk/include/linux/timerfd.h | 17 + trunk/include/linux/tty_driver.h | 9 + trunk/include/linux/tty_ldisc.h | 7 + trunk/include/linux/writeback.h | 10 +- trunk/include/media/saa7146.h | 2 + trunk/include/media/saa7146_vv.h | 2 + trunk/include/net/netfilter/nf_conntrack.h | 7 - .../net/netfilter/nf_conntrack_l3proto.h | 3 - trunk/include/net/netfilter/nf_nat_rule.h | 11 +- trunk/include/net/udp.h | 9 +- trunk/include/net/udplite.h | 2 +- trunk/include/sound/ak4114.h | 4 +- trunk/include/sound/mpu401.h | 1 + trunk/include/sound/pcm.h | 7 +- trunk/include/sound/version.h | 4 +- trunk/include/video/atmel_lcdc.h | 196 + trunk/include/video/pm3fb.h | 110 - trunk/init/Kconfig | 41 + trunk/init/main.c | 1 + trunk/ipc/mqueue.c | 4 + trunk/kernel/audit.h | 13 +- trunk/kernel/auditfilter.c | 48 +- trunk/kernel/auditsc.c | 311 +- trunk/kernel/compat.c | 8 +- trunk/kernel/exit.c | 22 +- trunk/kernel/fork.c | 24 +- trunk/kernel/irq/proc.c | 7 + trunk/kernel/pid.c | 11 +- trunk/kernel/ptrace.c | 3 + trunk/kernel/signal.c | 32 +- trunk/kernel/stop_machine.c | 4 + trunk/kernel/sys.c | 14 +- trunk/kernel/sys_ni.c | 7 + trunk/kernel/time/clocksource.c | 10 +- trunk/kernel/time/timekeeping.c | 2 + trunk/kernel/timer.c | 12 +- trunk/lib/Kconfig | 8 + trunk/lib/Kconfig.debug | 1 + trunk/lib/Makefile | 3 +- trunk/lib/audit.c | 11 + trunk/lib/crc-itu-t.c | 69 + trunk/lib/hexdump.c | 104 + trunk/mm/page-writeback.c | 59 +- trunk/mm/page_alloc.c | 2 +- trunk/mm/slub.c | 159 +- trunk/mm/thrash.c | 5 +- trunk/mm/vmstat.c | 2 +- trunk/net/Kconfig | 1 + trunk/net/ax25/Kconfig | 2 +- trunk/net/bluetooth/Kconfig | 2 +- trunk/net/bluetooth/hidp/core.c | 14 +- trunk/net/core/link_watch.c | 166 +- trunk/net/ipv4/netfilter/arptable_filter.c | 140 +- trunk/net/ipv4/netfilter/iptable_filter.c | 73 +- trunk/net/ipv4/netfilter/iptable_mangle.c | 99 +- trunk/net/ipv4/netfilter/iptable_raw.c | 79 +- trunk/net/ipv4/netfilter/nf_nat_rule.c | 86 +- trunk/net/ipv4/netfilter/nf_nat_standalone.c | 11 +- trunk/net/ipv4/proc.c | 21 + trunk/net/ipv4/udp.c | 85 +- trunk/net/ipv4/udp_impl.h | 6 +- trunk/net/ipv4/udplite.c | 7 +- trunk/net/ipv6/addrconf.c | 4 + trunk/net/ipv6/exthdrs.c | 16 +- trunk/net/ipv6/ip6_input.c | 2 +- trunk/net/ipv6/ip6_output.c | 13 +- trunk/net/ipv6/netfilter/ip6table_filter.c | 70 +- trunk/net/ipv6/netfilter/ip6table_mangle.c | 96 +- trunk/net/ipv6/netfilter/ip6table_raw.c | 52 +- trunk/net/ipv6/udp.c | 21 +- trunk/net/ipv6/udp_impl.h | 2 + trunk/net/ipv6/udplite.c | 2 +- trunk/net/irda/Kconfig | 2 +- trunk/net/mac80211/ieee80211_sta.c | 2 +- trunk/net/netfilter/nf_conntrack_core.c | 14 +- trunk/net/netfilter/nf_conntrack_netlink.c | 40 +- trunk/net/netfilter/xt_conntrack.c | 54 + trunk/net/rxrpc/ar-peer.c | 4 +- trunk/net/sched/sch_generic.c | 41 +- trunk/net/sched/sch_prio.c | 2 +- trunk/net/sched/sch_teql.c | 5 +- trunk/net/sctp/socket.c | 19 +- trunk/net/sctp/ulpevent.c | 11 +- trunk/net/xfrm/xfrm_hash.c | 3 +- trunk/net/xfrm/xfrm_policy.c | 4 + trunk/sound/Kconfig | 1 + trunk/sound/aoa/codecs/snd-aoa-codec-onyx.c | 4 +- trunk/sound/aoa/codecs/snd-aoa-codec-tas.c | 4 +- trunk/sound/aoa/soundbus/core.c | 2 - trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c | 5 +- trunk/sound/aoa/soundbus/soundbus.h | 2 + trunk/sound/core/pcm_native.c | 30 +- trunk/sound/core/rtctimer.c | 3 +- trunk/sound/drivers/mpu401/mpu401.c | 12 +- trunk/sound/drivers/mpu401/mpu401_uart.c | 18 +- trunk/sound/drivers/mts64.c | 4 +- trunk/sound/drivers/portman2x4.c | 4 +- trunk/sound/drivers/vx/vx_hwdep.c | 14 + trunk/sound/i2c/other/ak4114.c | 114 +- trunk/sound/isa/Kconfig | 22 +- trunk/sound/isa/ad1816a/ad1816a.c | 8 +- trunk/sound/isa/ad1848/ad1848.c | 167 +- trunk/sound/isa/adlib.c | 122 +- trunk/sound/isa/cmi8330.c | 115 +- trunk/sound/isa/cs423x/cs4231.c | 213 +- trunk/sound/isa/cs423x/cs4231_lib.c | 4 +- trunk/sound/isa/cs423x/cs4236.c | 131 +- trunk/sound/isa/es1688/es1688.c | 251 +- trunk/sound/isa/es18xx.c | 110 +- trunk/sound/isa/gus/gusclassic.c | 292 +- trunk/sound/isa/gus/gusextreme.c | 379 +- trunk/sound/isa/gus/gusmax.c | 71 +- trunk/sound/isa/gus/interwave.c | 101 +- trunk/sound/isa/opl3sa2.c | 127 +- trunk/sound/isa/opti9xx/miro.c | 80 +- trunk/sound/isa/opti9xx/opti92x-ad1848.c | 108 +- trunk/sound/isa/sb/sb16.c | 113 +- trunk/sound/isa/sb/sb16_csp.c | 30 +- trunk/sound/isa/sb/sb8.c | 90 +- trunk/sound/isa/sgalaxy.c | 107 +- trunk/sound/isa/sscape.c | 120 +- trunk/sound/isa/wavefront/wavefront.c | 113 +- trunk/sound/isa/wavefront/wavefront_fx.c | 23 +- trunk/sound/pci/Kconfig | 33 +- trunk/sound/pci/ac97/Makefile | 2 +- trunk/sound/pci/ac97/ac97_codec.c | 43 +- trunk/sound/pci/ac97/ac97_local.h | 55 +- trunk/sound/pci/ac97/ac97_patch.c | 194 +- trunk/sound/pci/ac97/ac97_patch.h | 110 +- trunk/sound/pci/ac97/ac97_pcm.c | 1 - trunk/sound/pci/ali5451/ali5451.c | 869 ++-- trunk/sound/pci/au88x0/au88x0_sb.h | 40 - trunk/sound/pci/azt3328.c | 34 +- trunk/sound/pci/azt3328.h | 4 +- trunk/sound/pci/bt87x.c | 4 +- trunk/sound/pci/ca0106/ca0106_main.c | 4 +- trunk/sound/pci/cs46xx/cs46xx_lib.c | 2 +- trunk/sound/pci/cs46xx/imgs/cwcemb80.h | 1607 ------- trunk/sound/pci/echoaudio/darla20.c | 2 + trunk/sound/pci/echoaudio/darla24.c | 2 + trunk/sound/pci/echoaudio/echo3g.c | 4 + trunk/sound/pci/echoaudio/echoaudio.c | 4 +- trunk/sound/pci/echoaudio/echoaudio_3g.c | 4 +- trunk/sound/pci/echoaudio/gina20.c | 2 + trunk/sound/pci/echoaudio/gina24.c | 6 + trunk/sound/pci/echoaudio/indigo.c | 3 + trunk/sound/pci/echoaudio/indigodj.c | 3 + trunk/sound/pci/echoaudio/indigoio.c | 3 + trunk/sound/pci/echoaudio/layla20.c | 3 + trunk/sound/pci/echoaudio/layla24.c | 6 + trunk/sound/pci/echoaudio/mia.c | 3 + trunk/sound/pci/echoaudio/mona.c | 9 + trunk/sound/pci/emu10k1/emu10k1_main.c | 24 +- trunk/sound/pci/emu10k1/p16v.c | 4 +- trunk/sound/pci/ens1370.c | 8 +- trunk/sound/pci/es1968.c | 11 +- trunk/sound/pci/hda/Makefile | 9 +- trunk/sound/pci/hda/hda_codec.c | 729 +-- trunk/sound/pci/hda/hda_codec.h | 2 +- trunk/sound/pci/hda/hda_generic.c | 2 +- trunk/sound/pci/hda/hda_intel.c | 31 +- trunk/sound/pci/hda/hda_local.h | 12 + trunk/sound/pci/hda/patch_analog.c | 85 +- trunk/sound/pci/hda/patch_atihdmi.c | 17 +- trunk/sound/pci/hda/patch_cmedia.c | 14 +- trunk/sound/pci/hda/patch_conexant.c | 310 +- trunk/sound/pci/hda/patch_realtek.c | 2271 ++++++++-- trunk/sound/pci/hda/patch_sigmatel.c | 178 +- trunk/sound/pci/hda/patch_via.c | 14 +- trunk/sound/pci/ice1712/amp.c | 2 +- trunk/sound/pci/ice1712/amp.h | 2 +- trunk/sound/pci/ice1712/aureon.c | 18 +- trunk/sound/pci/ice1712/aureon.h | 2 +- trunk/sound/pci/ice1712/delta.c | 34 +- trunk/sound/pci/ice1712/delta.h | 2 +- trunk/sound/pci/ice1712/ews.c | 24 +- trunk/sound/pci/ice1712/ews.h | 2 +- trunk/sound/pci/ice1712/hoontech.c | 6 +- trunk/sound/pci/ice1712/hoontech.h | 2 +- trunk/sound/pci/ice1712/ice1712.c | 50 +- trunk/sound/pci/ice1712/ice1712.h | 3 + trunk/sound/pci/ice1712/ice1724.c | 47 +- trunk/sound/pci/ice1712/juli.c | 24 +- trunk/sound/pci/ice1712/juli.h | 2 +- trunk/sound/pci/ice1712/phase.c | 14 +- trunk/sound/pci/ice1712/phase.h | 2 +- trunk/sound/pci/ice1712/pontis.c | 6 +- trunk/sound/pci/ice1712/pontis.h | 2 +- trunk/sound/pci/ice1712/prodigy192.c | 360 +- trunk/sound/pci/ice1712/prodigy192.h | 10 +- trunk/sound/pci/ice1712/revo.c | 26 +- trunk/sound/pci/ice1712/revo.h | 2 +- trunk/sound/pci/ice1712/vt1720_mobo.c | 6 +- trunk/sound/pci/ice1712/vt1720_mobo.h | 2 +- trunk/sound/pci/ice1712/wtm.c | 2 +- trunk/sound/pci/intel8x0.c | 20 +- trunk/sound/pci/korg1212/korg1212.c | 25 +- trunk/sound/pci/maestro3.c | 38 +- trunk/sound/pci/mixart/mixart_hwdep.c | 3 + trunk/sound/pci/pcxhr/pcxhr.c | 28 +- trunk/sound/pci/pcxhr/pcxhr_hwdep.c | 6 + trunk/sound/pci/riptide/riptide.c | 1 + trunk/sound/pci/rme32.c | 7 +- trunk/sound/pci/rme9652/hdsp.c | 99 +- trunk/sound/pci/rme9652/hdspm.c | 185 +- trunk/sound/pci/rme9652/rme9652.c | 8 +- trunk/sound/pci/trident/trident_main.c | 4 +- trunk/sound/pci/ymfpci/ymfpci_main.c | 55 +- trunk/sound/pcmcia/vx/vxpocket.c | 2 +- trunk/sound/soc/Kconfig | 18 +- trunk/sound/soc/Makefile | 2 +- trunk/sound/soc/at91/Kconfig | 10 +- trunk/sound/soc/at91/Makefile | 4 +- .../sound/soc/at91/{at91-i2s.c => at91-ssc.c} | 259 +- .../sound/soc/at91/{at91-i2s.h => at91-ssc.h} | 14 +- trunk/sound/soc/at91/eti_b1_wm8731.c | 8 +- trunk/sound/soc/codecs/Kconfig | 4 + trunk/sound/soc/codecs/Makefile | 2 + trunk/sound/soc/codecs/ac97.c | 1 + trunk/sound/soc/codecs/ac97.h | 1 + trunk/sound/soc/codecs/wm8750.c | 2 +- trunk/sound/soc/codecs/wm8753.c | 1811 ++++++++ trunk/sound/soc/codecs/wm8753.h | 126 + trunk/sound/soc/codecs/wm9712.c | 7 +- trunk/sound/soc/pxa/Kconfig | 4 - trunk/sound/soc/s3c24xx/Kconfig | 10 + trunk/sound/soc/s3c24xx/Makefile | 6 + trunk/sound/soc/s3c24xx/s3c24xx-i2s.c | 441 ++ trunk/sound/soc/s3c24xx/s3c24xx-i2s.h | 37 + trunk/sound/soc/s3c24xx/s3c24xx-pcm.c | 468 ++ trunk/sound/soc/s3c24xx/s3c24xx-pcm.h | 31 + trunk/sound/soc/soc-dapm.c | 6 +- trunk/sound/sparc/cs4231.c | 4 +- trunk/sound/usb/Kconfig | 28 + trunk/sound/usb/Makefile | 2 +- trunk/sound/usb/caiaq/Makefile | 3 + trunk/sound/usb/caiaq/caiaq-audio.c | 707 +++ trunk/sound/usb/caiaq/caiaq-audio.h | 7 + trunk/sound/usb/caiaq/caiaq-device.c | 436 ++ trunk/sound/usb/caiaq/caiaq-device.h | 116 + trunk/sound/usb/caiaq/caiaq-input.c | 246 + trunk/sound/usb/caiaq/caiaq-input.h | 8 + trunk/sound/usb/caiaq/caiaq-midi.c | 177 + trunk/sound/usb/caiaq/caiaq-midi.h | 8 + trunk/sound/usb/usbaudio.c | 3 + trunk/sound/usb/usbmidi.c | 58 +- trunk/sound/usb/usbquirks.h | 23 + 1201 files changed, 48308 insertions(+), 26553 deletions(-) delete mode 100644 trunk/Documentation/mips/pci/pci.README create mode 100644 trunk/arch/arm/configs/at91sam9rlek_defconfig create mode 100644 trunk/arch/arm/configs/ks8695_defconfig create mode 100644 trunk/arch/arm/mach-at91/at91sam9rl.c create mode 100644 trunk/arch/arm/mach-at91/at91sam9rl_devices.c create mode 100644 trunk/arch/arm/mach-at91/board-sam9rlek.c create mode 100644 trunk/arch/arm/mach-davinci/Kconfig create mode 100644 trunk/arch/arm/mach-davinci/Makefile create mode 100644 trunk/arch/arm/mach-davinci/Makefile.boot create mode 100644 trunk/arch/arm/mach-davinci/board-evm.c create mode 100644 trunk/arch/arm/mach-davinci/id.c create mode 100644 trunk/arch/arm/mach-davinci/io.c create mode 100644 trunk/arch/arm/mach-davinci/irq.c create mode 100644 trunk/arch/arm/mach-davinci/psc.c create mode 100644 trunk/arch/arm/mach-davinci/serial.c create mode 100644 trunk/arch/arm/mach-davinci/time.c create mode 100644 trunk/arch/arm/mach-iop13xx/msi.c create mode 100644 trunk/arch/arm/mach-ks8695/Kconfig create mode 100644 trunk/arch/arm/mach-ks8695/Makefile create mode 100644 trunk/arch/arm/mach-ks8695/Makefile.boot create mode 100644 trunk/arch/arm/mach-ks8695/board-micrel.c create mode 100644 trunk/arch/arm/mach-ks8695/cpu.c create mode 100644 trunk/arch/arm/mach-ks8695/devices.c create mode 100644 trunk/arch/arm/mach-ks8695/generic.h create mode 100644 trunk/arch/arm/mach-ks8695/irq.c create mode 100644 trunk/arch/arm/mach-ks8695/time.c create mode 100644 trunk/arch/arm/mach-s3c2410/h1940-bluetooth.c create mode 100644 trunk/arch/i386/kernel/smpcommon.c create mode 100644 trunk/arch/mips/au1000/Kconfig create mode 100644 trunk/arch/mips/cobalt/rtc.c create mode 100644 trunk/arch/mips/cobalt/serial.c delete mode 100644 trunk/arch/mips/configs/jaguar-atx_defconfig rename trunk/arch/mips/configs/{ocelot_g_defconfig => rbhma4200_defconfig} (73%) rename trunk/arch/mips/configs/{tb0229_defconfig => tb0219_defconfig} (99%) create mode 100644 trunk/arch/mips/lib/ucmpdi2.c delete mode 100644 trunk/arch/mips/momentum/Kconfig delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/Makefile delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/dbg_io.c delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/irq.c delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/ja-console.c delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/platform.c delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/prom.c delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/reset.c delete mode 100644 trunk/arch/mips/momentum/jaguar_atx/setup.c delete mode 100644 trunk/arch/mips/momentum/ocelot_g/Makefile delete mode 100644 trunk/arch/mips/momentum/ocelot_g/dbg_io.c delete mode 100644 trunk/arch/mips/momentum/ocelot_g/gt-irq.c delete mode 100644 trunk/arch/mips/momentum/ocelot_g/irq.c delete mode 100644 trunk/arch/mips/momentum/ocelot_g/ocelot_pld.h delete mode 100644 trunk/arch/mips/momentum/ocelot_g/prom.c delete mode 100644 trunk/arch/mips/momentum/ocelot_g/reset.c delete mode 100644 trunk/arch/mips/momentum/ocelot_g/setup.c delete mode 100644 trunk/arch/mips/pci/fixup-jaguar.c delete mode 100644 trunk/arch/mips/pci/fixup-ocelot-g.c delete mode 100644 trunk/arch/mips/pci/pci-ocelot-g.c create mode 100644 trunk/arch/mips/sgi-ip22/ip22-platform.c create mode 100644 trunk/arch/powerpc/boot/dts/prpmc2800.dts create mode 100644 trunk/arch/powerpc/boot/mpsc.c create mode 100644 trunk/arch/powerpc/boot/mv64x60.c create mode 100644 trunk/arch/powerpc/boot/mv64x60.h create mode 100644 trunk/arch/powerpc/boot/mv64x60_i2c.c create mode 100644 trunk/arch/powerpc/boot/prpmc2800.c create mode 100644 trunk/arch/powerpc/configs/prpmc2800_defconfig create mode 100644 trunk/arch/powerpc/platforms/embedded6xx/prpmc2800.c create mode 100644 trunk/arch/powerpc/sysdev/mv64x60.h create mode 100644 trunk/arch/powerpc/sysdev/mv64x60_dev.c create mode 100644 trunk/arch/powerpc/sysdev/mv64x60_pci.c create mode 100644 trunk/arch/powerpc/sysdev/mv64x60_pic.c delete mode 100644 trunk/arch/ppc/lib/rheap.c delete mode 100644 trunk/drivers/char/watchdog/i8xx_tco.c delete mode 100644 trunk/drivers/char/watchdog/i8xx_tco.h create mode 100644 trunk/drivers/char/watchdog/mtx-1_wdt.c create mode 100644 trunk/drivers/firewire/Kconfig create mode 100644 trunk/drivers/firewire/Makefile create mode 100644 trunk/drivers/firewire/fw-card.c create mode 100644 trunk/drivers/firewire/fw-cdev.c create mode 100644 trunk/drivers/firewire/fw-device.c create mode 100644 trunk/drivers/firewire/fw-device.h create mode 100644 trunk/drivers/firewire/fw-iso.c create mode 100644 trunk/drivers/firewire/fw-ohci.c create mode 100644 trunk/drivers/firewire/fw-ohci.h create mode 100644 trunk/drivers/firewire/fw-sbp2.c create mode 100644 trunk/drivers/firewire/fw-topology.c create mode 100644 trunk/drivers/firewire/fw-topology.h create mode 100644 trunk/drivers/firewire/fw-transaction.c create mode 100644 trunk/drivers/firewire/fw-transaction.h create mode 100644 trunk/drivers/net/irda/kingsun-sir.c rename trunk/drivers/s390/{ => char}/Kconfig (59%) create mode 100644 trunk/drivers/serial/serial_ks8695.c create mode 100644 trunk/drivers/spi/mpc52xx_psc_spi.c create mode 100644 trunk/drivers/video/atmel_lcdfb.c create mode 100644 trunk/fs/anon_inodes.c create mode 100644 trunk/fs/eventfd.c create mode 100644 trunk/fs/signalfd.c create mode 100644 trunk/fs/timerfd.c create mode 100644 trunk/include/asm-arm/arch-at91/at91sam9rl.h create mode 100644 trunk/include/asm-arm/arch-at91/at91sam9rl_matrix.h create mode 100644 trunk/include/asm-arm/arch-davinci/common.h create mode 100644 trunk/include/asm-arm/arch-davinci/debug-macro.S create mode 100644 trunk/include/asm-arm/arch-davinci/dma.h create mode 100644 trunk/include/asm-arm/arch-davinci/entry-macro.S create mode 100644 trunk/include/asm-arm/arch-davinci/hardware.h create mode 100644 trunk/include/asm-arm/arch-davinci/io.h create mode 100644 trunk/include/asm-arm/arch-davinci/irqs.h create mode 100644 trunk/include/asm-arm/arch-davinci/memory.h create mode 100644 trunk/include/asm-arm/arch-davinci/psc.h create mode 100644 trunk/include/asm-arm/arch-davinci/serial.h create mode 100644 trunk/include/asm-arm/arch-davinci/system.h create mode 100644 trunk/include/asm-arm/arch-davinci/timex.h create mode 100644 trunk/include/asm-arm/arch-davinci/uncompress.h create mode 100644 trunk/include/asm-arm/arch-davinci/vmalloc.h create mode 100644 trunk/include/asm-arm/arch-iop13xx/msi.h create mode 100644 trunk/include/asm-arm/arch-ks8695/debug-macro.S create mode 100644 trunk/include/asm-arm/arch-ks8695/devices.h create mode 100644 trunk/include/asm-arm/arch-ks8695/dma.h create mode 100644 trunk/include/asm-arm/arch-ks8695/entry-macro.S create mode 100644 trunk/include/asm-arm/arch-ks8695/hardware.h create mode 100644 trunk/include/asm-arm/arch-ks8695/io.h create mode 100644 trunk/include/asm-arm/arch-ks8695/irqs.h create mode 100644 trunk/include/asm-arm/arch-ks8695/memory.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-gpio.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-hpna.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-irq.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-lan.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-mem.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-misc.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-pci.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-switch.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-sys.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-timer.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-uart.h create mode 100644 trunk/include/asm-arm/arch-ks8695/regs-wan.h create mode 100644 trunk/include/asm-arm/arch-ks8695/system.h create mode 100644 trunk/include/asm-arm/arch-ks8695/timex.h create mode 100644 trunk/include/asm-arm/arch-ks8695/uncompress.h create mode 100644 trunk/include/asm-arm/arch-ks8695/vmalloc.h create mode 100644 trunk/include/asm-generic/audit_signal.h create mode 100644 trunk/include/asm-generic/poll.h delete mode 100644 trunk/include/asm-mips/mach-ja/cpu-feature-overrides.h delete mode 100644 trunk/include/asm-mips/mach-ja/spaces.h create mode 100644 trunk/include/asm-mips/sgi/seeq.h create mode 100644 trunk/include/asm-mips/sgi/wd.h create mode 100644 trunk/include/asm-powerpc/reg_booke.h rename trunk/include/{asm-ppc => asm-powerpc}/rheap.h (75%) create mode 100644 trunk/include/linux/anon_inodes.h create mode 100644 trunk/include/linux/crc-itu-t.h create mode 100644 trunk/include/linux/eventfd.h create mode 100644 trunk/include/linux/firewire-cdev.h create mode 100644 trunk/include/linux/firewire-constants.h create mode 100644 trunk/include/linux/signalfd.h create mode 100644 trunk/include/linux/timerfd.h create mode 100644 trunk/include/video/atmel_lcdc.h create mode 100644 trunk/lib/crc-itu-t.c create mode 100644 trunk/lib/hexdump.c delete mode 100644 trunk/sound/pci/au88x0/au88x0_sb.h delete mode 100644 trunk/sound/pci/cs46xx/imgs/cwcemb80.h rename trunk/sound/soc/at91/{at91-i2s.c => at91-ssc.c} (73%) rename trunk/sound/soc/at91/{at91-i2s.h => at91-ssc.h} (72%) create mode 100644 trunk/sound/soc/codecs/wm8753.c create mode 100644 trunk/sound/soc/codecs/wm8753.h create mode 100644 trunk/sound/soc/s3c24xx/Kconfig create mode 100644 trunk/sound/soc/s3c24xx/Makefile create mode 100644 trunk/sound/soc/s3c24xx/s3c24xx-i2s.c create mode 100644 trunk/sound/soc/s3c24xx/s3c24xx-i2s.h create mode 100644 trunk/sound/soc/s3c24xx/s3c24xx-pcm.c create mode 100644 trunk/sound/soc/s3c24xx/s3c24xx-pcm.h create mode 100644 trunk/sound/usb/caiaq/Makefile create mode 100644 trunk/sound/usb/caiaq/caiaq-audio.c create mode 100644 trunk/sound/usb/caiaq/caiaq-audio.h create mode 100644 trunk/sound/usb/caiaq/caiaq-device.c create mode 100644 trunk/sound/usb/caiaq/caiaq-device.h create mode 100644 trunk/sound/usb/caiaq/caiaq-input.c create mode 100644 trunk/sound/usb/caiaq/caiaq-input.h create mode 100644 trunk/sound/usb/caiaq/caiaq-midi.c create mode 100644 trunk/sound/usb/caiaq/caiaq-midi.h diff --git a/[refs] b/[refs] index b69ed0bdef73..dbec10c2d77f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c5b9ef8577bfa7b74ea58fc9ff2934ffce13532 +refs/heads/master: de7860c3f3272086a4c3a1b4280b11ffae7c32be diff --git a/trunk/CREDITS b/trunk/CREDITS index 6829e91a88d4..273d72b610c3 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -2299,8 +2299,8 @@ E: acme@redhat.com W: http://oops.ghostprotocols.net:81/blog/ P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks -S: R. Brasílio Itiberê, 4270/1010 - Água Verde -S: 80240-060 - Curitiba - Paraná +S: R. Brasílio Itiberê, 4270/1010 - Ãgua Verde +S: 80240-060 - Curitiba - Paraná S: Brazil N: Karsten Merker diff --git a/trunk/Documentation/SubmitChecklist b/trunk/Documentation/SubmitChecklist index 6491b2c45dd4..3af3e65cf43b 100644 --- a/trunk/Documentation/SubmitChecklist +++ b/trunk/Documentation/SubmitChecklist @@ -73,9 +73,9 @@ kernel patches. If the new code is substantial, addition of subsystem-specific fault injection might be appropriate. -22: Newly-added code has been compiled with `gcc -W'. This will generate - lots of noise, but is good for finding bugs like "warning: comparison - between signed and unsigned". +22: Newly-added code has been compiled with `gcc -W' (use "make + EXTRA_CFLAGS=-W"). This will generate lots of noise, but is good for + finding bugs like "warning: comparison between signed and unsigned". 23: Tested after it has been merged into the -mm patchset to make sure that it still works with all of the other queued patches and various diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 676b7981adb7..498ff31f3aa1 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -278,14 +278,6 @@ Who: Richard Purdie --------------------------- -What: i8xx_tco watchdog driver -When: in 2.6.22 -Why: the i8xx_tco watchdog driver has been replaced by the iTCO_wdt - watchdog driver. -Who: Wim Van Sebroeck - ---------------------------- - What: Multipath cached routing support in ipv4 When: in 2.6.23 Why: Code was merged, then submitter immediately disappeared leaving @@ -336,3 +328,22 @@ Who: Adrian Bunk --------------------------- +What: libata.spindown_compat module parameter +When: Dec 2008 +Why: halt(8) synchronizes caches for and spins down libata disks + because libata didn't use to spin down disk on system halt + (only synchronized caches). + Spin down on system halt is now implemented and can be tested + using sysfs node /sys/class/scsi_disk/h:c:i:l/manage_start_stop. + Because issuing spin down command to an already spun down disk + makes some disks spin up just to spin down again, the old + behavior needs to be maintained till userspace tool is updated + to check the sysfs node and not to spin down disks with the + node set to one. + This module parameter is to give userspace tool the time to + get updated and should be removed after userspace is + reasonably updated. +Who: Tejun Heo + +--------------------------- + diff --git a/trunk/Documentation/gpio.txt b/trunk/Documentation/gpio.txt index f8528db967fa..e8be0abb346c 100644 --- a/trunk/Documentation/gpio.txt +++ b/trunk/Documentation/gpio.txt @@ -66,7 +66,9 @@ registers; another might implement it by delegating through abstractions used for several very different kinds of GPIO controller. That said, if the convention is supported on their platform, drivers should -use it when possible: +use it when possible. Platforms should declare GENERIC_GPIO support in +Kconfig (boolean true), which multi-platform drivers can depend on when +using the include file: #include diff --git a/trunk/Documentation/kref.txt b/trunk/Documentation/kref.txt index 42fe28445916..f38b59d00c63 100644 --- a/trunk/Documentation/kref.txt +++ b/trunk/Documentation/kref.txt @@ -67,7 +67,7 @@ void more_data_handling(void *cb_data) . . do stuff with data here . - kref_put(data, data_release); + kref_put(&data->refcount, data_release); } int my_data_handler(void) diff --git a/trunk/Documentation/mips/pci/pci.README b/trunk/Documentation/mips/pci/pci.README deleted file mode 100644 index 8697ee41372d..000000000000 --- a/trunk/Documentation/mips/pci/pci.README +++ /dev/null @@ -1,54 +0,0 @@ - -Pete Popov, ppopov@pacbell.net -07/11/2001 - -This README briefly explains how to use the pci and pci_auto -code in arch/mips/kernel. The code was ported from PowerPC and -modified slightly. It has been tested pretty well on PPC on some -rather complex systems with multiple bridges and devices behind -each bridge. However, at the time this README was written, the -mips port was tested only on boards with a single pci bus and -no P2P bridges. It's very possible that on boards with P2P -bridges some modifications have to be made. The code will -evolve, no doubt, but currently every single mips board -is doing its own pcibios thing and it has become a big -mess. This generic pci code is meant to clean up the mips -pci mess and make it easier to add pci support to new boards. - -inside the define for your board in arch/mips/config.in. -For example, the Galileo EV96100 board looks like this: - -if [ "$CONFIG_MIPS_EV96100" = "y" ]; then - define_bool CONFIG_PCI y - define_bool CONFIG_MIPS_GT96100 y - define_bool CONFIG_NEW_PCI y - define_bool CONFIG_SWAP_IO_SPACE y -fi - - -Next, if you want to use the arch/mips/kernel/pci code, which has the -pcibios_init() function, add - -define_bool CONFIG_NEW_PCI y - -inside the define for your board. Again, the EV96100 example above -show NEW_PCI turned on. - - -Now you need to add your files to hook in your pci configuration -cycles. Usually you'll need only a couple of files named something -like pci_fixups.c and pci_ops.c. You can copy the templates -provided and fill in the code. - -The file pci_ops.c should contain the pci configuration cycles routines. -It also has the mips_pci_channels[] array which contains the descriptors -of each pci controller. - -The file pci_fixups.c contains a few routines to do interrupt fixups, -resources fixups, and, if needed, pci bios fixups. - -Usually you'll put your pci_fixups.c file in your board specific directory, -since the functions in that file are board specific. The functions in -pci_ops.c, on the other hand, are usually pci controller specific so that -file could be shared among a few different boards using the same -pci controller. diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index 73e9a174b642..57b878cc393c 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -821,6 +821,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 6stack-dig 6-jack digital with SPDIF I/O arima Arima W820Di1 macpro MacPro support + w2jc ASUS W2JC auto auto-config reading BIOS (default) ALC883/888 @@ -852,6 +853,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 3stack-dig 3-jack with SPDIF OUT 6stack-dig 6-jack with SPDIF OUT 3stack-660 3-jack (for ALC660VD) + lenovo Lenovo 3000 C200 auto auto-config reading BIOS (default) CMI9880 @@ -909,6 +911,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. macbook Intel Mac Book macbook-pro-v1 Intel Mac Book Pro 1st generation macbook-pro Intel Mac Book Pro 2nd generation + imac-intel Intel iMac STAC9202/9250/9251 ref Reference board, base config @@ -924,6 +927,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. vaio Setup for VAIO FE550G/SZ110 vaio-ar Setup for VAIO AR + The model name "genric" is treated as a special case. When this + model is given, the driver uses the generic codec parser without + "codec-patch". It's sometimes good for testing and debugging. + If the default configuration doesn't work and one of the above matches with your device, report it together with the PCI subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel @@ -1278,6 +1285,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. port - port number or -1 (disable) irq - IRQ number or -1 (disable) pnp - PnP detection - 0 = disable, 1 = enable (default) + uart_enter - Issue UART_ENTER command at open - bool, default = on This module supports multiple devices and PnP. @@ -1692,6 +1700,17 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. This module supports multiple devices, autoprobe and hotplugging. + Module snd-usb-caiaq + -------------------- + + Module for caiaq UB audio interfaces, + * Native Instruments RigKontrol2 + * Native Instruments Kore Controller + * Native Instruments Audio Kontrol 1 + * Native Instruments Audio 8 DJ + + This module supports multiple devices, autoprobe and hotplugging. + Module snd-usb-usx2y -------------------- @@ -2046,4 +2065,4 @@ Links and Addresses https://bugtrack.alsa-project.org/bugs/ ALSA Developers ML - mailto:alsa-devel@lists.sourceforge.net + mailto:alsa-devel@alsa-project.org diff --git a/trunk/Documentation/sound/alsa/Bt87x.txt b/trunk/Documentation/sound/alsa/Bt87x.txt index 11edb2fd2a5a..f158cde8b065 100644 --- a/trunk/Documentation/sound/alsa/Bt87x.txt +++ b/trunk/Documentation/sound/alsa/Bt87x.txt @@ -36,8 +36,8 @@ recorded data is not right, try to specify the digital_rate option with other values than the default 32000 (often it's 44100 or 64000). If you have an unknown card, please mail the ID and board name to -, regardless of whether audio capture works or -not, so that future versions of this driver know about your card. +, regardless of whether audio capture works +or not, so that future versions of this driver know about your card. Audio modes diff --git a/trunk/Documentation/video4linux/CARDLIST.saa7134 b/trunk/Documentation/video4linux/CARDLIST.saa7134 index d7bb2e2e4d9b..712e8c8333cc 100644 --- a/trunk/Documentation/video4linux/CARDLIST.saa7134 +++ b/trunk/Documentation/video4linux/CARDLIST.saa7134 @@ -52,7 +52,7 @@ 51 -> ProVideo PV952 [1540:9524] 52 -> AverMedia AverTV/305 [1461:2108] 53 -> ASUS TV-FM 7135 [1043:4845] - 54 -> LifeView FlyTV Platinum FM / Gold [5168:0214,1489:0214,5168:0304] + 54 -> LifeView FlyTV Platinum FM / Gold [5168:0214,5168:5214,1489:0214,5168:0304] 55 -> LifeView FlyDVB-T DUO / MSI TV@nywhere Duo [5168:0306,4E42:0306] 56 -> Avermedia AVerTV 307 [1461:a70a] 57 -> Avermedia AVerTV GO 007 FM [1461:f31f] @@ -111,3 +111,6 @@ 110 -> Avermedia M102 [1461:f31e] 111 -> ASUS P7131 4871 [1043:4871] 112 -> ASUSTeK P7131 Hybrid [1043:4876] +113 -> Elitegroup ECS TVP3XP FM1246 Tuner Card (PAL,FM) [1019:4cb6] +114 -> KWorld DVB-T 210 [17de:7250] +115 -> Sabrent PCMCIA TV-PCB05 [0919:2003] diff --git a/trunk/Documentation/video4linux/sn9c102.txt b/trunk/Documentation/video4linux/sn9c102.txt index 5fe0ad7dfc20..279717c96f63 100644 --- a/trunk/Documentation/video4linux/sn9c102.txt +++ b/trunk/Documentation/video4linux/sn9c102.txt @@ -355,6 +355,9 @@ devices assembling the SN9C1xx PC camera controllers: Vendor ID Product ID --------- ---------- +0x0458 0x7025 +0x045e 0x00f5 +0x045e 0x00f7 0x0471 0x0327 0x0471 0x0328 0x0c45 0x6001 @@ -432,7 +435,7 @@ Image sensor / SN9C1xx bridge | SN9C10[12] SN9C103 SN9C105 SN9C120 HV7131D Hynix Semiconductor | Yes No No No HV7131R Hynix Semiconductor | No Yes Yes Yes MI-0343 Micron Technology | Yes No No No -MI-0360 Micron Technology | No Yes No No +MI-0360 Micron Technology | No Yes Yes Yes OV7630 OmniVision Technologies | Yes Yes No No OV7660 OmniVision Technologies | No No Yes Yes PAS106B PixArt Imaging | Yes No No No @@ -478,13 +481,12 @@ scaling factor is restored to 1. This driver supports two different video formats: the first one is the "8-bit Sequential Bayer" format and can be used to obtain uncompressed video data from the device through the current I/O method, while the second one provides -"raw" compressed video data (without frame headers not related to the -compressed data). The compression quality may vary from 0 to 1 and can be -selected or queried thanks to the VIDIOC_S_JPEGCOMP and VIDIOC_G_JPEGCOMP V4L2 -ioctl's. For maximum flexibility, both the default active video format and the -default compression quality depend on how the image sensor being used is -initialized (as described in the documentation of the API for the image sensors -supplied by this driver). +either "raw" compressed video data (without frame headers not related to the +compressed data) or standard JPEG (with frame headers). The compression quality +may vary from 0 to 1 and can be selected or queried thanks to the +VIDIOC_S_JPEGCOMP and VIDIOC_G_JPEGCOMP V4L2 ioctl's. For maximum flexibility, +both the default active video format and the default compression quality +depend on how the image sensor being used is initialized. 11. Video frame formats [1] diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index cfd26ddccd7a..bbeb5b6b5b05 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -372,7 +372,7 @@ AOA (Apple Onboard Audio) ALSA DRIVER P: Johannes Berg M: johannes@sipsolutions.net L: linuxppc-dev@ozlabs.org -L: alsa-devel@alsa-project.org +L: alsa-devel@alsa-project.org (subscribers-only) S: Maintained APM DRIVER @@ -1712,18 +1712,10 @@ L: Linux-Kernel@vger.kernel.org S: Maintained i386 SETUP CODE / CPU ERRATA WORKAROUNDS -P: Dave Jones -M: davej@codemonkey.org.uk P: H. Peter Anvin M: hpa@zytor.com S: Maintained -i810 TCO TIMER WATCHDOG -P: Nils Faerber -M: nils@kernelconcepts.de -W: http://www.kernelconcepts.de/ -S: Maintained - IA64 (Itanium) PLATFORM P: Tony Luck M: tony.luck@intel.com @@ -3245,13 +3237,13 @@ S: Maintained SOUND P: Jaroslav Kysela M: perex@suse.cz -L: alsa-devel@alsa-project.org +L: alsa-devel@alsa-project.org (subscribers-only) S: Maintained SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT P: Liam Girdwood M: liam.girdwood@wolfsonmicro.com -L: alsa-devel@alsa-project.org +L: alsa-devel@alsa-project.org (subscribers-only) S: Supported SPI SUBSYSTEM diff --git a/trunk/Makefile b/trunk/Makefile index dfe559c89fe6..e6990e2cdafc 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 21 -EXTRAVERSION = +SUBLEVEL = 22 +EXTRAVERSION = -rc1 NAME = Nocturnal Monster Puppy # *DOCUMENTATION* diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index d7c0984d4a86..e55bbd32dcac 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -114,9 +114,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_BUST_SPINLOCK - bool - config ARCH_MAY_HAVE_PC_FDC bool @@ -247,6 +244,15 @@ config ARCH_IMX help Support for Motorola's i.MX family of processors (MX1, MXL). +config ARCH_IOP13XX + bool "IOP13xx-based" + depends on MMU + select PLAT_IOP + select PCI + select ARCH_SUPPORTS_MSI + help + Support for Intel's IOP13XX (XScale) family of processors. + config ARCH_IOP32X bool "IOP32x-based" depends on MMU @@ -264,22 +270,12 @@ config ARCH_IOP33X help Support for Intel's IOP33X (XScale) family of processors. -config ARCH_IOP13XX - bool "IOP13xx-based" - depends on MMU - select PLAT_IOP - select PCI - select ARCH_SUPPORTS_MSI - help - Support for Intel's IOP13XX (XScale) family of processors. - -config ARCH_IXP4XX - bool "IXP4xx-based" +config ARCH_IXP23XX + bool "IXP23XX-based" depends on MMU - select GENERIC_TIME - select GENERIC_CLOCKEVENTS + select PCI help - Support for Intel's IXP4XX (XScale) family of processors. + Support for Intel's IXP23xx (XScale) family of processors. config ARCH_IXP2000 bool "IXP2400/2800-based" @@ -288,12 +284,13 @@ config ARCH_IXP2000 help Support for Intel's IXP2400/2800 (XScale) family of processors. -config ARCH_IXP23XX - bool "IXP23XX-based" +config ARCH_IXP4XX + bool "IXP4xx-based" depends on MMU - select PCI + select GENERIC_TIME + select GENERIC_CLOCKEVENTS help - Support for Intel's IXP23xx (XScale) family of processors. + Support for Intel's IXP4XX (XScale) family of processors. config ARCH_L7200 bool "LinkUp-L7200" @@ -308,6 +305,12 @@ config ARCH_L7200 If you have any questions or comments about the Linux kernel port to this board, send e-mail to . +config ARCH_KS8695 + bool "Micrel/Kendin KS8695" + help + Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based + System-on-Chip devices. + config ARCH_NS9XXX bool "NetSilicon NS9xxx" help @@ -354,7 +357,6 @@ config ARCH_SA1100 config ARCH_S3C2410 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" select GENERIC_GPIO - select GENERIC_TIME help Samsung S3C2410X CPU based systems, such as the Simtec Electronics BAST (), the IPAQ 1940 or @@ -377,6 +379,13 @@ config ARCH_LH7A40X core with a wide array of integrated devices for hand-held and low-power applications. +config ARCH_DAVINCI + bool "TI DaVinci" + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + help + Support for TI's DaVinci platform. + config ARCH_OMAP bool "TI OMAP" select GENERIC_GPIO @@ -445,6 +454,10 @@ source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-ns9xxx/Kconfig" +source "arch/arm/mach-davinci/Kconfig" + +source "arch/arm/mach-ks8695/Kconfig" + # Definitions to make life easier config ARCH_ACORN bool @@ -505,7 +518,7 @@ config ISA_DMA_API bool config PCI - bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX + bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 help Find out whether you have a PCI motherboard. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside @@ -674,7 +687,8 @@ config LEDS ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ - ARCH_AT91 || MACH_TRIZEPS4 + ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \ + ARCH_KS8695 help If you say Y here, the LEDs on your machine will be used to provide useful information about your current system status. diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 00ea4305ad5d..cbd5010d3bc3 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -135,6 +135,8 @@ endif machine-$(CONFIG_ARCH_NETX) := netx machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx textofs-$(CONFIG_ARCH_NS9XXX) := 0x00108000 + machine-$(CONFIG_ARCH_DAVINCI) := davinci + machine-$(CONFIG_ARCH_KS8695) := ks8695 ifeq ($(CONFIG_ARCH_EBSA110),y) # This is what happens if you forget the IOCS16 line. diff --git a/trunk/arch/arm/configs/at91sam9rlek_defconfig b/trunk/arch/arm/configs/at91sam9rlek_defconfig new file mode 100644 index 000000000000..fbe8b3049343 --- /dev/null +++ b/trunk/arch/arm/configs/at91sam9rlek_defconfig @@ -0,0 +1,957 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.21 +# Mon May 7 16:30:40 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +# CONFIG_GENERIC_TIME is not set +CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +CONFIG_ARCH_AT91=y +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set + +# +# Atmel AT91 System-on-Chip +# +# CONFIG_ARCH_AT91RM9200 is not set +# CONFIG_ARCH_AT91SAM9260 is not set +# CONFIG_ARCH_AT91SAM9261 is not set +# CONFIG_ARCH_AT91SAM9263 is not set +CONFIG_ARCH_AT91SAM9RL=y + +# +# AT91SAM9RL Board Type +# +CONFIG_MACH_AT91SAM9RLEK=y + +# +# AT91 Board Options +# + +# +# AT91 Feature Selections +# +# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,17105363 root=/dev/ram0 rw" +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +# CONFIG_PACKET is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +# CONFIG_INET is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_DATAFLASH=y +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_AT91=y +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNPACPI is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=4 +CONFIG_BLK_DEV_RAM_SIZE=24576 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_DEBUG is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +# CONFIG_NETDEVICES is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +# CONFIG_SERIAL_ATMEL_TTYAT is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_ATMEL=y +# CONFIG_SPI_BITBANG is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# + +# +# Graphics support +# +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_ATMEL=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_SEQUENCER=y +CONFIG_SND_SEQ_DUMMY=y +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +CONFIG_SND_DEBUG_DETECT=y +# CONFIG_SND_PCM_XRUN_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_AT91=y + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=y +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=y +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +CONFIG_NLS_ISO8859_15=y +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_ERRORS is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/trunk/arch/arm/configs/ks8695_defconfig b/trunk/arch/arm/configs/ks8695_defconfig new file mode 100644 index 000000000000..8ab21a0719e9 --- /dev/null +++ b/trunk/arch/arm/configs/ks8695_defconfig @@ -0,0 +1,880 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17-rc4 +# Thu May 25 15:42:51 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=y + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91 is not set +CONFIG_ARCH_KS8695=y + +# +# Kendin/Micrel KS8695 Implementations +# +CONFIG_MACH_KS8695=y +# CONFIG_MACH_DSM320 is not set +# CONFIG_MACH_CM4002 is not set +# CONFIG_MACH_CM4008 is not set +# CONFIG_MACH_CM40xx is not set +# CONFIG_MACH_LITE300 is not set +# CONFIG_MACH_SE4200 is not set +# CONFIG_MACH_MANGA_KS8695 is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM922T=y +CONFIG_CPU_32v4=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set + +# +# Bus support +# +CONFIG_PCI=y +CONFIG_PCI_DEBUG=y + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=y +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +# CONFIG_PD6729 is not set +# CONFIG_I82092 is not set +CONFIG_PCCARD_NONSTATIC=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" +# CONFIG_XIP_KERNEL is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_IEEE1394 is not set + +# +# I2O device support +# +# CONFIG_I2O is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +# CONFIG_MII is not set +CONFIG_ARM_KS8695_ETHER=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set + +# +# Tulip family network device support +# +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_NET_PCI is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set + +# +# Ethernet (10000 Mbit) +# +# CONFIG_CHELSIO_T1 is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_KS8695=y +CONFIG_SERIAL_KS8695_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + +# +# Misc devices +# + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +# CONFIG_FB is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=y +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +# CONFIG_NLS is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_ERRORS is not set +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y diff --git a/trunk/arch/arm/configs/trizeps4_defconfig b/trunk/arch/arm/configs/trizeps4_defconfig index a6698dc4f6b9..6db6392806f9 100644 --- a/trunk/arch/arm/configs/trizeps4_defconfig +++ b/trunk/arch/arm/configs/trizeps4_defconfig @@ -1,15 +1,27 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17 -# Sat Jun 24 22:45:14 2006 +# Linux kernel version: 2.6.21 +# Mon Apr 30 21:23:20 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options @@ -26,18 +38,25 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" -CONFIG_UID16=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y @@ -49,10 +68,11 @@ CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set -CONFIG_OBSOLETE_INTERMODULE=y # # Loadable module support @@ -60,14 +80,17 @@ CONFIG_OBSOLETE_INTERMODULE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y # # Block layer # +CONFIG_BLOCK=y +CONFIG_LBD=y # CONFIG_BLK_DEV_IO_TRACE is not set +CONFIG_LSF=y # # IO Schedulers @@ -85,18 +108,29 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set @@ -104,12 +138,6 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_AT91RM9200 is not set # # Intel PXA2xx Implementations @@ -133,11 +161,16 @@ CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_IWMMXT=y CONFIG_XSCALE_PMU=y # @@ -147,16 +180,16 @@ CONFIG_XSCALE_PMU=y # # PCCARD (PCMCIA/CardBus) support # -CONFIG_PCCARD=m +CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA=y +# CONFIG_PCMCIA_LOAD_CIS is not set CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # -CONFIG_PCMCIA_PXA2XX=m +CONFIG_PCMCIA_PXA2XX=y # # Kernel Features @@ -164,7 +197,8 @@ CONFIG_PCMCIA_PXA2XX=m CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -174,6 +208,8 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 CONFIG_LEDS=y CONFIG_LEDS_TIMER=y CONFIG_LEDS_CPU=y @@ -184,8 +220,9 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_CMDLINE="root=/dev/nfs ip=bootp console=ttyS0,115200n8" +CONFIG_CMDLINE="root=fe01 console=ttyS0,38400n8 loglevel=5" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # Floating point emulation @@ -203,16 +240,16 @@ CONFIG_FPE_NWFPE_XP=y # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set -CONFIG_BINFMT_MISC=m -# CONFIG_ARTHUR is not set +# CONFIG_BINFMT_MISC is not set # # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set -CONFIG_APM=y +# CONFIG_PM_SYSFS_DEPRECATED is not set +# CONFIG_APM_EMULATION is not set # # Networking @@ -222,13 +259,15 @@ CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set @@ -246,24 +285,25 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # # IP: Virtual Server Configuration # # CONFIG_IP_VS is not set -CONFIG_IPV6=m -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set -# CONFIG_IPV6_TUNNEL is not set +# CONFIG_NETLABEL is not set +# CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set @@ -271,29 +311,16 @@ CONFIG_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set # CONFIG_NETFILTER_XTABLES is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -CONFIG_IP_NF_CT_ACCT=y -CONFIG_IP_NF_CONNTRACK_MARK=y -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -# CONFIG_IP_NF_CT_PROTO_SCTP is not set -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set CONFIG_IP_NF_QUEUE=m - -# -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# -# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set # # DCCP Configuration (EXPERIMENTAL) @@ -318,7 +345,6 @@ CONFIG_VLAN_8021Q=m # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -378,6 +404,7 @@ CONFIG_IRTTY_SIR=m # CONFIG_USB_IRDA is not set # CONFIG_SIGMATEL_FIR is not set # CONFIG_PXA_FICP is not set +# CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -401,14 +428,20 @@ CONFIG_BT_HIDP=m # CONFIG_BT_HCIBLUECARD is not set # CONFIG_BT_HCIBTUART is not set # CONFIG_BT_HCIVHCI is not set -CONFIG_IEEE80211=m +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +CONFIG_CFG80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_IEEE80211=y # CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_WEP=y CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set -CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -420,16 +453,13 @@ CONFIG_WIRELESS_EXT=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker # CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set CONFIG_MTD_CONCAT=y @@ -445,12 +475,13 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set -CONFIG_NFTL=y -CONFIG_NFTL_RW=y -CONFIG_INFTL=y +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set # # RAM/ROM/Flash chip drivers @@ -490,9 +521,8 @@ CONFIG_MTD_CFI_UTIL=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_START=0x0 -CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_LEN=0x0 CONFIG_MTD_PHYSMAP_BANKWIDTH=2 -# CONFIG_MTD_TRIZEPS4 is not set # CONFIG_MTD_ARM_INTEGRATOR is not set # CONFIG_MTD_IMPA7 is not set # CONFIG_MTD_SHARP_SL is not set @@ -501,42 +531,45 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # # Self-contained MTD device drivers # -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_BLOCK2MTD=y # # Disk-On-Chip Device Drivers # -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set +CONFIG_MTD_DOC2000=y +CONFIG_MTD_DOC2001=y CONFIG_MTD_DOC2001PLUS=y CONFIG_MTD_DOCPROBE=y CONFIG_MTD_DOCECC=y -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -CONFIG_MTD_DOCPROBE_ADDRESS=0 - -# -# NAND Flash Device Drivers -# +CONFIG_MTD_DOCPROBE_ADVANCED=y +CONFIG_MTD_DOCPROBE_ADDRESS=0x4000000 +CONFIG_MTD_DOCPROBE_HIGH=y +# CONFIG_MTD_DOCPROBE_55AA is not set CONFIG_MTD_NAND=y # CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_H1900 is not set CONFIG_MTD_NAND_IDS=y CONFIG_MTD_NAND_DISKONCHIP=y -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x4000000 +CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y +CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y # CONFIG_MTD_NAND_SHARPSL is not set # CONFIG_MTD_NAND_NANDSIM is not set +CONFIG_MTD_ONENAND=y +# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set +# CONFIG_MTD_ONENAND_GENERIC is not set +# CONFIG_MTD_ONENAND_OTP is not set # -# OneNAND Flash Device Drivers +# UBI - Unsorted block images # -# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD_UBI is not set # # Parallel port support @@ -546,6 +579,7 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 # # Plug and Play support # +# CONFIG_PNPACPI is not set # # Block devices @@ -556,9 +590,9 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=y # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=4 +CONFIG_BLK_DEV_RAM_COUNT=8 CONFIG_BLK_DEV_RAM_SIZE=4096 -CONFIG_BLK_DEV_INITRD=y +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -566,6 +600,7 @@ CONFIG_BLK_DEV_INITRD=y # ATA/ATAPI/MFM/RLL support # CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 CONFIG_BLK_DEV_IDE=y # @@ -585,27 +620,27 @@ CONFIG_BLK_DEV_IDECS=m # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y -CONFIG_IDE_PXA_CF=y -CONFIG_IDE_ARM=y +# CONFIG_IDE_ARM is not set # CONFIG_BLK_DEV_IDEDMA is not set -# CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set # # SCSI device support # # CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=m +CONFIG_SCSI=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=m +CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set -CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SG=y # CONFIG_CHR_DEV_SCH is not set # @@ -614,21 +649,23 @@ CONFIG_CHR_DEV_SG=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set # -# SCSI Transport Attributes +# SCSI Transports # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set # # SCSI low-level drivers # # CONFIG_ISCSI_TCP is not set -# CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_ESP_CORE is not set # # PCMCIA SCSI adapter support @@ -639,6 +676,14 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PLATFORM=m + # # Multi-device support (RAID and LVM) # @@ -675,10 +720,14 @@ CONFIG_PHYLIB=y # MII PHY device drivers # # CONFIG_MARVELL_PHY is not set -CONFIG_DAVICOM_PHY=y +# CONFIG_DAVICOM_PHY is not set # CONFIG_QSEMI_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_FIXED_PHY is not set # # Ethernet (10 or 100Mbit) @@ -687,6 +736,7 @@ CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_SMC91X is not set CONFIG_DM9000=y +# CONFIG_SMC911X is not set # # Ethernet (1000 Mbit) @@ -701,41 +751,23 @@ CONFIG_DM9000=y # # -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -# CONFIG_NET_WIRELESS_RTNETLINK is not set - -# -# Obsolete Wireless cards support (pre-802.11) -# -# CONFIG_STRIP is not set -# CONFIG_PCMCIA_WAVELAN is not set -# CONFIG_PCMCIA_NETWAVE is not set - -# -# Wireless 802.11 Frequency Hopping cards support +# Wireless LAN # +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y # CONFIG_PCMCIA_RAYCS is not set - -# -# Wireless 802.11b ISA/PCI cards support -# -CONFIG_HERMES=m +CONFIG_HERMES=y # CONFIG_ATMEL is not set - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# -CONFIG_PCMCIA_HERMES=m -# CONFIG_PCMCIA_SPECTRUM is not set -CONFIG_AIRO_CS=m +CONFIG_PCMCIA_HERMES=y +CONFIG_PCMCIA_SPECTRUM=y +# CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set -CONFIG_HOSTAP=m +# CONFIG_USB_ZD1201 is not set +CONFIG_HOSTAP=y CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_CS=m -CONFIG_NET_WIRELESS=y +CONFIG_HOSTAP_CS=y +# CONFIG_ZD1211RW is not set # # PCMCIA network device support @@ -756,6 +788,7 @@ CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m # CONFIG_PPPOE is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -770,6 +803,7 @@ CONFIG_PPP_MPPE=m # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces @@ -789,22 +823,27 @@ CONFIG_INPUT_EVDEV=y # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_ATKBD=m # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set -CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_SERIAL=m # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +CONFIG_TOUCHSCREEN_UCB1400=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -823,6 +862,7 @@ CONFIG_SERIO_LIBPS2=y CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -862,14 +902,11 @@ CONFIG_SA1100_WATCHDOG=y # USB-based Watchdog Cards # # CONFIG_USBPCWATCHDOG is not set +CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set -# -# Ftape, the floppy tape device driver -# - # # PCMCIA character devices # @@ -882,7 +919,6 @@ CONFIG_SA1100_WATCHDOG=y # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set # # I2C support @@ -902,6 +938,7 @@ CONFIG_I2C_CHARDEV=y # CONFIG_I2C_PXA=y CONFIG_I2C_PXA_SLAVE=y +# CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set @@ -911,7 +948,7 @@ CONFIG_I2C_PXA_SLAVE=y # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set -CONFIG_SENSORS_EEPROM=m +# CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set @@ -924,18 +961,8 @@ CONFIG_SENSORS_EEPROM=m # # SPI support # -CONFIG_SPI=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_BITBANG is not set -CONFIG_SPI_PXA2XX=m - -# -# SPI Protocol Masters -# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set # # Dallas's 1-wire bus @@ -947,9 +974,11 @@ CONFIG_SPI_PXA2XX=m # CONFIG_HWMON=y # CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set # CONFIG_SENSORS_ASB100 is not set @@ -973,10 +1002,15 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LM92 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set # CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set # CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set @@ -987,16 +1021,15 @@ CONFIG_HWMON=y # # -# Multimedia Capabilities Port drivers +# Multifunction device drivers # -CONFIG_UCB1400=y -CONFIG_UCB1400_TS=y +# CONFIG_MFD_SM501 is not set # # LED devices # CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +# CONFIG_LEDS_CLASS is not set # # LED drivers @@ -1007,13 +1040,13 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_IDE_DISK=y +# CONFIG_LEDS_TRIGGER_IDE_DISK is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=y # # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices @@ -1024,17 +1057,28 @@ CONFIG_VIDEO_V4L2=y # # Graphics support # +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set -CONFIG_FB_FIRMWARE_EDID=y +# CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y # CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set # @@ -1063,11 +1107,6 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_DEVICE=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_DEVICE=y # # Sound @@ -1082,7 +1121,7 @@ CONFIG_SND_TIMER=y CONFIG_SND_PCM=y CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m -CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQUENCER=y # CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=y @@ -1093,13 +1132,14 @@ CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y CONFIG_SND_VERBOSE_PRINTK=y -# CONFIG_SND_DEBUG is not set +CONFIG_SND_DEBUG=y +CONFIG_SND_DEBUG_DETECT=y +# CONFIG_SND_PCM_XRUN_DEBUG is not set # # Generic devices # CONFIG_SND_AC97_CODEC=y -CONFIG_SND_AC97_BUS=y # CONFIG_SND_DUMMY is not set # CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set @@ -1123,10 +1163,33 @@ CONFIG_SND_USB_AUDIO=m # CONFIG_SND_VXPOCKET is not set # CONFIG_SND_PDAUDIOCF is not set +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + # # Open Sound System # # CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y + +# +# HID Devices +# +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB Input Devices +# +# CONFIG_USB_HID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set # # USB support @@ -1141,7 +1204,7 @@ CONFIG_USB=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set @@ -1151,7 +1214,8 @@ CONFIG_USB_DEVICEFS=y # # CONFIG_USB_ISP116X_HCD is not set CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_SL811_HCD is not set @@ -1179,38 +1243,25 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set # # USB Input Devices # -CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set # CONFIG_USB_AIPTEK is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_ACECAD is not set # CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set -CONFIG_USB_TOUCHSCREEN=m -# CONFIG_USB_TOUCHSCREEN_EGALAX is not set -# CONFIG_USB_TOUCHSCREEN_PANJIT is not set -# CONFIG_USB_TOUCHSCREEN_3M is not set -# CONFIG_USB_TOUCHSCREEN_ITM is not set +# CONFIG_USB_TOUCHSCREEN is not set # CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set # CONFIG_USB_ATI_REMOTE is not set # CONFIG_USB_ATI_REMOTE2 is not set # CONFIG_USB_KEYSPAN_REMOTE is not set # CONFIG_USB_APPLETOUCH is not set +# CONFIG_USB_GTCO is not set # # USB Imaging devices @@ -1225,9 +1276,9 @@ CONFIG_USB_TOUCHSCREEN=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set # CONFIG_USB_USBNET is not set -# CONFIG_USB_ZD1201 is not set -CONFIG_USB_MON=y +# CONFIG_USB_MON is not set # # USB port drivers @@ -1236,23 +1287,66 @@ CONFIG_USB_MON=y # # USB Serial Converter support # -# CONFIG_USB_SERIAL is not set +CONFIG_USB_SERIAL=m +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_AIRCABLE is not set +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_CP2101 is not set +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_DEBUG is not set # # USB Miscellaneous drivers # # CONFIG_USB_EMI62 is not set # CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set # CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGETKIT is not set -# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # @@ -1262,9 +1356,10 @@ CONFIG_USB_MON=y # # USB Gadget Support # -CONFIG_USB_GADGET=y +CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set @@ -1272,15 +1367,14 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set CONFIG_USB_GADGET_DUMMY_HCD=y -CONFIG_USB_DUMMY_HCD=y +CONFIG_USB_DUMMY_HCD=m CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m +# CONFIG_USB_ETH is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set # # MMC/SD Card support @@ -1295,8 +1389,8 @@ CONFIG_MMC_PXA=y # CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_HCTOSYS is not set +# CONFIG_RTC_DEBUG is not set # # RTC interfaces @@ -1304,17 +1398,25 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set # # RTC drivers # +# CONFIG_RTC_DRV_CMOS is not set # CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_PCF8563 is not set +CONFIG_RTC_DRV_PCF8583=m # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems @@ -1328,6 +1430,7 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4DEV_FS is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y @@ -1335,10 +1438,12 @@ CONFIG_FS_MBCACHE=y # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set @@ -1365,8 +1470,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15" # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -1376,18 +1483,17 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_JFFS_FS=y -CONFIG_JFFS_FS_VERBOSE=0 -CONFIG_JFFS_PROC_FS=y CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y @@ -1407,20 +1513,18 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_NFS_FS=y CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y +# CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFS_DIRECTIO is not set CONFIG_NFSD=y -CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y +# CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y CONFIG_ROOT_NFS=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y -CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y @@ -1430,7 +1534,9 @@ CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -1503,23 +1609,29 @@ CONFIG_NLS_ISO8859_15=m # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=m +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + # # Profiling support # -CONFIG_PROFILING=y -CONFIG_OPROFILE=y +# CONFIG_PROFILING is not set # # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_FS is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set CONFIG_DEBUG_USER=y # @@ -1531,22 +1643,31 @@ CONFIG_SECURITY=y # CONFIG_SECURITY_NETWORK is not set CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set -# CONFIG_SECURITY_SECLVL is not set # # Cryptographic options # CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_MANAGER=y # CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_NULL is not set -CONFIG_CRYPTO_MD4=y +# CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set @@ -1554,12 +1675,13 @@ CONFIG_CRYPTO_AES=m # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set -CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_TEST is not set # @@ -1569,6 +1691,7 @@ CONFIG_CRYPTO_CRC32C=y # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y CONFIG_CRC32=y @@ -1577,3 +1700,6 @@ CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_REED_SOLOMON=y CONFIG_REED_SOLOMON_DEC16=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/trunk/arch/arm/kernel/armksyms.c b/trunk/arch/arm/kernel/armksyms.c index 4779f474f911..9179e8220314 100644 --- a/trunk/arch/arm/kernel/armksyms.c +++ b/trunk/arch/arm/kernel/armksyms.c @@ -76,6 +76,7 @@ EXPORT_SYMBOL(__const_udelay); /* networking */ EXPORT_SYMBOL(csum_partial); +EXPORT_SYMBOL(csum_partial_copy_from_user); EXPORT_SYMBOL(csum_partial_copy_nocheck); EXPORT_SYMBOL(__csum_ipv6_magic); diff --git a/trunk/arch/arm/kernel/ecard.c b/trunk/arch/arm/kernel/ecard.c index bdbd7da99286..f56d48c451ea 100644 --- a/trunk/arch/arm/kernel/ecard.c +++ b/trunk/arch/arm/kernel/ecard.c @@ -41,11 +41,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -958,6 +958,31 @@ void ecard_release_resources(struct expansion_card *ec) } EXPORT_SYMBOL(ecard_release_resources); +void ecard_setirq(struct expansion_card *ec, const struct expansion_card_ops *ops, void *irq_data) +{ + ec->irq_data = irq_data; + barrier(); + ec->ops = ops; +} +EXPORT_SYMBOL(ecard_setirq); + +void __iomem *ecardm_iomap(struct expansion_card *ec, unsigned int res, + unsigned long offset, unsigned long maxsize) +{ + unsigned long start = ecard_resource_start(ec, res); + unsigned long end = ecard_resource_end(ec, res); + + if (offset > (end - start)) + return NULL; + + start += offset; + if (maxsize && end - start > maxsize) + end = start + maxsize; + + return devm_ioremap(&ec->dev, start, end - start); +} +EXPORT_SYMBOL(ecardm_iomap); + /* * Probe for an expansion card. * @@ -1133,6 +1158,14 @@ static int ecard_drv_remove(struct device *dev) drv->remove(ec); ecard_release(ec); + /* + * Restore the default operations. We ensure that the + * ops are set before we change the data. + */ + ec->ops = &ecard_default_ops; + barrier(); + ec->irq_data = NULL; + return 0; } diff --git a/trunk/arch/arm/kernel/stacktrace.c b/trunk/arch/arm/kernel/stacktrace.c index 77ef35efaa8d..398d0c0511eb 100644 --- a/trunk/arch/arm/kernel/stacktrace.c +++ b/trunk/arch/arm/kernel/stacktrace.c @@ -52,21 +52,15 @@ static int save_trace(struct stackframe *frame, void *d) return trace->nr_entries >= trace->max_entries; } -void save_stack_trace(struct stack_trace *trace, struct task_struct *task) +void save_stack_trace(struct stack_trace *trace) { struct stack_trace_data data; unsigned long fp, base; data.trace = trace; data.skip = trace->skip; - - if (task) { - base = (unsigned long)task_stack_page(task); - fp = 0; /* FIXME */ - } else { - base = (unsigned long)task_stack_page(current); - asm("mov %0, fp" : "=r" (fp)); - } + base = (unsigned long)task_stack_page(current); + asm("mov %0, fp" : "=r" (fp)); walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data); } diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c index d0540e4eaf5b..1533d3ecd7a0 100644 --- a/trunk/arch/arm/kernel/time.c +++ b/trunk/arch/arm/kernel/time.c @@ -512,7 +512,7 @@ void __init time_init(void) #ifdef CONFIG_NO_IDLE_HZ if (system_timer->dyn_tick) - system_timer->dyn_tick->lock = SPIN_LOCK_UNLOCKED; + spin_lock_init(&system_timer->dyn_tick->lock); #endif } diff --git a/trunk/arch/arm/mach-at91/Kconfig b/trunk/arch/arm/mach-at91/Kconfig index 018d637f87fc..a31157f1655a 100644 --- a/trunk/arch/arm/mach-at91/Kconfig +++ b/trunk/arch/arm/mach-at91/Kconfig @@ -17,6 +17,9 @@ config ARCH_AT91SAM9261 config ARCH_AT91SAM9263 bool "AT91SAM9263" +config ARCH_AT91SAM9RL + bool "AT91SAM9RL" + endchoice # ---------------------------------------------------------- @@ -152,6 +155,20 @@ endif # ---------------------------------------------------------- +if ARCH_AT91SAM9RL + +comment "AT91SAM9RL Board Type" + +config MACH_AT91SAM9RLEK + bool "Atmel AT91SAM9RL-EK Evaluation Kit" + depends on ARCH_AT91SAM9RL + help + Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit. + +endif + +# ---------------------------------------------------------- + comment "AT91 Board Options" config MTD_AT91_DATAFLASH_CARD diff --git a/trunk/arch/arm/mach-at91/Makefile b/trunk/arch/arm/mach-at91/Makefile index a412ae18a421..a4d80eb056ee 100644 --- a/trunk/arch/arm/mach-at91/Makefile +++ b/trunk/arch/arm/mach-at91/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devic obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o +obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o # AT91RM9200 board-specific support obj-$(CONFIG_MACH_ONEARM) += board-1arm.o @@ -36,9 +37,13 @@ obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o # AT91SAM9263 board-specific support obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o +# AT91SAM9RL board-specific support +obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o + # LEDs support led-$(CONFIG_ARCH_AT91RM9200DK) += leds.o led-$(CONFIG_MACH_AT91RM9200EK) += leds.o +led-$(CONFIG_MACH_AT91SAM9261EK)+= leds.o led-$(CONFIG_MACH_CSB337) += leds.o led-$(CONFIG_MACH_CSB637) += leds.o led-$(CONFIG_MACH_KB9200) += leds.o diff --git a/trunk/arch/arm/mach-at91/at91rm9200_devices.c b/trunk/arch/arm/mach-at91/at91rm9200_devices.c index 2624a4f22d61..70599bcf451c 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200_devices.c +++ b/trunk/arch/arm/mach-at91/at91rm9200_devices.c @@ -22,9 +22,6 @@ #include "generic.h" -#define SZ_512 0x00000200 -#define SZ_256 0x00000100 -#define SZ_16 0x00000010 /* -------------------------------------------------------------------- * USB Host diff --git a/trunk/arch/arm/mach-at91/at91sam9260_devices.c b/trunk/arch/arm/mach-at91/at91sam9260_devices.c index 40586e22cd38..ffd3154c1e54 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9260_devices.c @@ -22,9 +22,6 @@ #include "generic.h" -#define SZ_512 0x00000200 -#define SZ_256 0x00000100 -#define SZ_16 0x00000010 /* -------------------------------------------------------------------- * USB Host diff --git a/trunk/arch/arm/mach-at91/at91sam9261_devices.c b/trunk/arch/arm/mach-at91/at91sam9261_devices.c index 8e781997716a..9db58da04754 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9261_devices.c @@ -23,9 +23,6 @@ #include "generic.h" -#define SZ_512 0x00000200 -#define SZ_256 0x00000100 -#define SZ_16 0x00000010 /* -------------------------------------------------------------------- * USB Host diff --git a/trunk/arch/arm/mach-at91/at91sam9263_devices.c b/trunk/arch/arm/mach-at91/at91sam9263_devices.c index 2b2e18a67128..635695787f91 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9263_devices.c @@ -22,9 +22,6 @@ #include "generic.h" -#define SZ_512 0x00000200 -#define SZ_256 0x00000100 -#define SZ_16 0x00000010 /* -------------------------------------------------------------------- * USB Host diff --git a/trunk/arch/arm/mach-at91/at91sam9rl.c b/trunk/arch/arm/mach-at91/at91sam9rl.c new file mode 100644 index 000000000000..4813a35f6cf5 --- /dev/null +++ b/trunk/arch/arm/mach-at91/at91sam9rl.c @@ -0,0 +1,341 @@ +/* + * arch/arm/mach-at91/at91sam9rl.c + * + * Copyright (C) 2005 SAN People + * Copyright (C) 2007 Atmel Corporation + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include + +#include +#include +#include +#include +#include +#include + +#include "generic.h" +#include "clock.h" + +static struct map_desc at91sam9rl_io_desc[] __initdata = { + { + .virtual = AT91_VA_BASE_SYS, + .pfn = __phys_to_pfn(AT91_BASE_SYS), + .length = SZ_16K, + .type = MT_DEVICE, + }, +}; + +static struct map_desc at91sam9rl_sram_desc[] __initdata = { + { + .pfn = __phys_to_pfn(AT91SAM9RL_SRAM_BASE), + .type = MT_DEVICE, + } +}; + +/* -------------------------------------------------------------------- + * Clocks + * -------------------------------------------------------------------- */ + +/* + * The peripheral clocks. + */ +static struct clk pioA_clk = { + .name = "pioA_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_PIOA, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk pioB_clk = { + .name = "pioB_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_PIOB, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk pioC_clk = { + .name = "pioC_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_PIOC, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk pioD_clk = { + .name = "pioD_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_PIOD, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk usart0_clk = { + .name = "usart0_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_US0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk usart1_clk = { + .name = "usart1_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_US1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk usart2_clk = { + .name = "usart2_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_US2, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk usart3_clk = { + .name = "usart3_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_US3, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk mmc_clk = { + .name = "mci_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_MCI, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk twi0_clk = { + .name = "twi0_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_TWI0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk twi1_clk = { + .name = "twi1_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_TWI1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk spi_clk = { + .name = "spi_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_SPI, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk ssc0_clk = { + .name = "ssc0_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_SSC0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk ssc1_clk = { + .name = "ssc1_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_SSC1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk tc0_clk = { + .name = "tc0_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_TC0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk tc1_clk = { + .name = "tc1_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_TC1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk tc2_clk = { + .name = "tc2_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_TC2, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk pwmc_clk = { + .name = "pwmc_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_PWMC, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk tsc_clk = { + .name = "tsc_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_TSC, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk dma_clk = { + .name = "dma_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_DMA, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk udphs_clk = { + .name = "udphs_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_UDPHS, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk lcdc_clk = { + .name = "lcdc_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_LCDC, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk ac97_clk = { + .name = "ac97_clk", + .pmc_mask = 1 << AT91SAM9RL_ID_AC97C, + .type = CLK_TYPE_PERIPHERAL, +}; + +static struct clk *periph_clocks[] __initdata = { + &pioA_clk, + &pioB_clk, + &pioC_clk, + &pioD_clk, + &usart0_clk, + &usart1_clk, + &usart2_clk, + &usart3_clk, + &mmc_clk, + &twi0_clk, + &twi1_clk, + &spi_clk, + &ssc0_clk, + &ssc1_clk, + &tc0_clk, + &tc1_clk, + &tc2_clk, + &pwmc_clk, + &tsc_clk, + &dma_clk, + &udphs_clk, + &lcdc_clk, + &ac97_clk, + // irq0 +}; + +/* + * The two programmable clocks. + * You must configure pin multiplexing to bring these signals out. + */ +static struct clk pck0 = { + .name = "pck0", + .pmc_mask = AT91_PMC_PCK0, + .type = CLK_TYPE_PROGRAMMABLE, + .id = 0, +}; +static struct clk pck1 = { + .name = "pck1", + .pmc_mask = AT91_PMC_PCK1, + .type = CLK_TYPE_PROGRAMMABLE, + .id = 1, +}; + +static void __init at91sam9rl_register_clocks(void) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(periph_clocks); i++) + clk_register(periph_clocks[i]); + + clk_register(&pck0); + clk_register(&pck1); +} + +/* -------------------------------------------------------------------- + * GPIO + * -------------------------------------------------------------------- */ + +static struct at91_gpio_bank at91sam9rl_gpio[] = { + { + .id = AT91SAM9RL_ID_PIOA, + .offset = AT91_PIOA, + .clock = &pioA_clk, + }, { + .id = AT91SAM9RL_ID_PIOB, + .offset = AT91_PIOB, + .clock = &pioB_clk, + }, { + .id = AT91SAM9RL_ID_PIOC, + .offset = AT91_PIOC, + .clock = &pioC_clk, + }, { + .id = AT91SAM9RL_ID_PIOD, + .offset = AT91_PIOD, + .clock = &pioD_clk, + } +}; + +static void at91sam9rl_reset(void) +{ + at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST); +} + + +/* -------------------------------------------------------------------- + * AT91SAM9RL processor initialization + * -------------------------------------------------------------------- */ + +void __init at91sam9rl_initialize(unsigned long main_clock) +{ + unsigned long cidr, sram_size; + + /* Map peripherals */ + iotable_init(at91sam9rl_io_desc, ARRAY_SIZE(at91sam9rl_io_desc)); + + cidr = at91_sys_read(AT91_DBGU_CIDR); + + switch (cidr & AT91_CIDR_SRAMSIZ) { + case AT91_CIDR_SRAMSIZ_32K: + sram_size = 2 * SZ_16K; + break; + case AT91_CIDR_SRAMSIZ_16K: + default: + sram_size = SZ_16K; + } + + at91sam9rl_sram_desc->virtual = AT91_IO_VIRT_BASE - sram_size; + at91sam9rl_sram_desc->length = sram_size; + + /* Map SRAM */ + iotable_init(at91sam9rl_sram_desc, ARRAY_SIZE(at91sam9rl_sram_desc)); + + at91_arch_reset = at91sam9rl_reset; + at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0); + + /* Init clock subsystem */ + at91_clock_init(main_clock); + + /* Register the processor-specific clocks */ + at91sam9rl_register_clocks(); + + /* Register GPIO subsystem */ + at91_gpio_init(at91sam9rl_gpio, 4); +} + +/* -------------------------------------------------------------------- + * Interrupt initialization + * -------------------------------------------------------------------- */ + +/* + * The default interrupt priority levels (0 = lowest, 7 = highest). + */ +static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = { + 7, /* Advanced Interrupt Controller */ + 7, /* System Peripherals */ + 1, /* Parallel IO Controller A */ + 1, /* Parallel IO Controller B */ + 1, /* Parallel IO Controller C */ + 1, /* Parallel IO Controller D */ + 5, /* USART 0 */ + 5, /* USART 1 */ + 5, /* USART 2 */ + 5, /* USART 3 */ + 0, /* Multimedia Card Interface */ + 6, /* Two-Wire Interface 0 */ + 6, /* Two-Wire Interface 1 */ + 5, /* Serial Peripheral Interface */ + 4, /* Serial Synchronous Controller 0 */ + 4, /* Serial Synchronous Controller 1 */ + 0, /* Timer Counter 0 */ + 0, /* Timer Counter 1 */ + 0, /* Timer Counter 2 */ + 0, + 0, /* Touch Screen Controller */ + 0, /* DMA Controller */ + 2, /* USB Device High speed port */ + 2, /* LCD Controller */ + 6, /* AC97 Controller */ + 0, + 0, + 0, + 0, + 0, + 0, + 0, /* Advanced Interrupt Controller */ +}; + +void __init at91sam9rl_init_interrupts(unsigned int priority[NR_AIC_IRQS]) +{ + if (!priority) + priority = at91sam9rl_default_irq_priority; + + /* Initialize the AIC interrupt controller */ + at91_aic_init(priority); + + /* Enable GPIO interrupts */ + at91_gpio_irq_setup(); +} diff --git a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c new file mode 100644 index 000000000000..cd7532bcd4e5 --- /dev/null +++ b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c @@ -0,0 +1,630 @@ +/* + * Copyright (C) 2007 Atmel Corporation + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include +#include + +#include +#include + +#include