commit 14b395e35d1afdd8019d11b92e28041fad591b71 Merge: 734b397... 5108b27... Author: Linus Torvalds Date: Sun Jul 20 21:21:46 2008 -0700 Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux * 'for-2.6.27' of git://linux-nfs.org/~bfields/linux: (51 commits) nfsd: nfs4xdr.c do-while is not a compound statement nfsd: Use C99 initializers in fs/nfsd/nfs4xdr.c lockd: Pass "struct sockaddr *" to new failover-by-IP function lockd: get host reference in nlmsvc_create_block() instead of callers lockd: minor svclock.c style fixes lockd: eliminate duplicate nlmsvc_lookup_host call from nlmsvc_lock lockd: eliminate duplicate nlmsvc_lookup_host call from nlmsvc_testlock lockd: nlm_release_host() checks for NULL, caller needn't file lock: reorder struct file_lock to save space on 64 bit builds nfsd: take file and mnt write in nfs4_upgrade_open nfsd: document open share bit tracking nfsd: tabulate nfs4 xdr encoding functions nfsd: dprint operation names svcrdma: Change WR context get/put to use the kmem cache svcrdma: Create a kmem cache for the WR contexts svcrdma: Add flush_scheduled_work to module exit function svcrdma: Limit ORD based on client's advertised IRD svcrdma: Remove unused wait q from svcrdma_xprt structure svcrdma: Remove unneeded spin locks from __svc_rdma_free svcrdma: Add dma map count and WARN_ON ... commit 734b397cd14f3340394a8dd3266bec97d01f034b Merge: 702beb8... e6b5163... Author: Linus Torvalds Date: Sun Jul 20 21:19:17 2008 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: gpu: re-order GPU subdirectory vs char for AGP vs DRM startup. commit 702beb87d6b4e08cca394b210679e5d7c2ac9383 Author: David Miller Date: Sun Jul 20 18:17:02 2008 -0700 ipv6: Fix warning in addrconf code. Reported by Linus. Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds commit d1671a9c15f55a1475d41269494518e348880c33 Merge: ae0645a... 3a682fb... Author: Linus Torvalds Date: Sun Jul 20 21:17:20 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: pkt_sched: Fix build with NET_SCHED disabled. commit ae0645a451b02ad35c520b01177b70ebd59c91ab Merge: f894d18... 99cdb0c... Author: Linus Torvalds Date: Sun Jul 20 21:16:27 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: let asic3 use mem resource instead of bus_shift mfd: remove DS1WM register definitions from asic3.h mfd: add ASIC3_CONFIG_GPIO templates mfd: fix the asic3 irq demux code mfd: asic3 should depend on gpiolib mfd: fix asic3 config array initialisation mfd: move asic3 probe functions into __init section mfd: Use uppercase only for asic3 macros and defines mfd: use dev_* macros for asic3 debugging mfd: New asic3 gpio configuration code mfd: asic3 children platform data removal mfd: asic3 gpiolib support commit f894d18380e7e7ff05f6622ccb75d2881922c6e9 Merge: d13ff05... d20b274... Author: Linus Torvalds Date: Sun Jul 20 21:14:42 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (277 commits) V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms. V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on" V4L/DVB (8390): videodev: add comment and remove magic number. V4L/DVB (8389): videodev: simplify get_index() V4L/DVB (8387): Some cosmetic changes V4L/DVB (8381): ov7670: fix compile warnings V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name. V4L/DVB (8379): saa7127: Make device detection optional V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver. ... commit d13ff0559fea73f237a01669887d2c10e11d7662 Merge: f076ab8... cb7f39d... Author: Linus Torvalds Date: Sun Jul 20 21:14:00 2008 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (21 commits) [MIPS] Remove unused maltasmp.h. [MIPS] Remove unused saa9730_uart.h. [MIPS] Rename MIPS sys_pipe syscall entry point to something MIPS-specific. [MIPS] 32-bit compat: Delete unused sys_truncate64 and sys_ftruncate64. [MIPS] TXx9: Fix some sparse warnings [MIPS] TXx9: Add 64-bit support [MIPS] TXx9: Cleanups for 64-bit support [MIPS] Cobalt: Fix I/O port resource range [MIPS] don't leak setup_early_printk() in userspace header [MIPS] Remove include/asm-mips/mips-boards/sead{,int}.h [MIPS] Remove asm-mips/mips-boards/atlas{,int}.h [MIPS] mips/sgi-ip22/ip28-berr.c: fix the build [MIPS] TXx9: Miscellaneous build fixes [MIPS] Routerboard 532: Support for base system [MIPS] IP32: Use common SGI button driver [MIPS] IP22: Use common SGI button driver [MIPS] IP22, IP28: Fix merge bug [MIPS] Tinker with constraints in to fix build error. [MIPS] Add missing prototypes to asm/page.h [MIPS] Fix missing prototypes in asm/fpu.h ... commit f076ab8d048f152b968bb1c6313fed88abb037fe Merge: db6d8c7... 597a5f5... Author: Linus Torvalds Date: Sun Jul 20 21:13:26 2008 -0700 Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (70 commits) KVM: Adjust smp_call_function_mask() callers to new requirements KVM: MMU: Fix potential race setting upper shadow ptes on nonpae hosts KVM: x86 emulator: emulate clflush KVM: MMU: improve invalid shadow root page handling KVM: MMU: nuke shadowed pgtable pages and ptes on memslot destruction KVM: Prefix some x86 low level function with kvm_, to avoid namespace issues KVM: check injected pic irq within valid pic irqs KVM: x86 emulator: Fix HLT instruction KVM: Apply the kernel sigmask to vcpus blocked due to being uninitialized KVM: VMX: Add ept_sync_context in flush_tlb KVM: mmu_shrink: kvm_mmu_zap_page requires slots_lock to be held x86: KVM guest: make kvm_smp_prepare_boot_cpu() static KVM: SVM: fix suspend/resume support KVM: s390: rename private structures KVM: s390: Set guest storage limit and offset to sane values KVM: Fix memory leak on guest exit KVM: s390: dont allocate dirty bitmap KVM: move slots_lock acquision down to vapic_exit KVM: VMX: Fake emulate Intel perfctr MSRs KVM: VMX: Fix a wrong usage of vmcs_config ... commit 3a682fbd732d3d27bec722a923952b0938e8a404 Author: David S. Miller Date: Sun Jul 20 18:13:01 2008 -0700 pkt_sched: Fix build with NET_SCHED disabled. The stab bits can't be referenced uniless the full packet scheduler layer is enabled. Reported by Stephen Rothwell. Signed-off-by: David S. Miller commit db6d8c7a4027b48d797b369a53f8470aaeed7063 Merge: 3a53337... fb65a7c... Author: Linus Torvalds Date: Sun Jul 20 17:43:29 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits) iucv: Fix bad merging. net_sched: Add size table for qdiscs net_sched: Add accessor function for packet length for qdiscs net_sched: Add qdisc_enqueue wrapper highmem: Export totalhigh_pages. ipv6 mcast: Omit redundant address family checks in ip6_mc_source(). net: Use standard structures for generic socket address structures. ipv6 netns: Make several "global" sysctl variables namespace aware. netns: Use net_eq() to compare net-namespaces for optimization. ipv6: remove unused macros from net/ipv6.h ipv6: remove unused parameter from ip6_ra_control tcp: fix kernel panic with listening_get_next tcp: Remove redundant checks when setting eff_sacks tcp: options clean up tcp: Fix MD5 signatures for non-linear skbs sctp: Update sctp global memory limit allocations. sctp: remove unnecessary byteshifting, calculate directly in big-endian sctp: Allow only 1 listening socket with SO_REUSEADDR sctp: Do not leak memory on multiple listen() calls sctp: Support ipv6only AF_INET6 sockets. ... commit 3a533374283aea50eab3976d8a6d30532175f009 Merge: fb6624e... d17ffb4... Author: Linus Torvalds Date: Sun Jul 20 17:37:46 2008 -0700 Merge branch 'for-linus' of git://www.jni.nu/cris * 'for-linus' of git://www.jni.nu/cris: [CRISv10] Clean up compressed/misc.c [CRISv10] Correct whitespace damage. [CRIS] Correct definition of subdirs for install_headers. [CRIS] Correct image makefiles to allow using a separate OBJ-directory. [CRIS] Build fixes for compressed and rescue images for v10 and v32: It looks at least odd to apply spin_unlock to a mutex. cris: compile fixes for 2.6.26-rc5 commit fb6624ebd912e3d6907ca6490248e73368223da9 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:36 2008 +0200 initrd: Fix virtual/physical mix-up in overwrite test On recent kernels, I get the following error when using an initrd: | initrd overwritten (0x00b78000 < 0x07668000) - disabling it. My Amiga 4000 has 12 MiB of RAM at physical address 0x07400000 (virtual 0x00000000). The initrd is located at the end of RAM: 0x00b78000 - 0x00c00000 (virtual). The overwrite test compares the (virtual) initrd location to the (physical) first available memory location, which fails. This patch converts initrd_start to a page frame number, so it can safely be compared with min_low_pfn. Before the introduction of discontiguous memory support on m68k (12d810c1b8c2b913d48e629e2b5c01d105029839), min_low_pfn was just left untouched by the m68k-specific code (zero, I guess), and everything worked fine. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 18c993629a5a5938a032f04a698d15122550593d Author: Akinobu Mita Date: Thu Jul 17 21:16:35 2008 +0200 dio: use dio_match_device() in dio_bus_match() dio_bus_match() can use dio_match_device(). Signed-off-by: Akinobu Mita Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 93026e217b46b70f9719caf69e716fa3bbe1d20c Author: Julia Lawall Date: Thu Jul 17 21:16:34 2008 +0200 arch/m68k/mm/sun3mmu.c: Eliminate NULL test and memset after alloc_bootmem As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E - memset(E,0,E1); // Signed-off-by: Julia Lawall Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 7b6b948fc0d60a704c15b1cd72345a98e759dd62 Author: Julia Lawall Date: Thu Jul 17 21:16:33 2008 +0200 arch/m68k/mm/motorola.c: Eliminate NULL test and memset after alloc_bootmem As noted by Akinobu Mita in patch b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. This was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // @@ expression E; statement S; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E ( - BUG_ON (E == NULL); | - if (E == NULL) S ) @@ expression E,E1; @@ E = \(alloc_bootmem\|alloc_bootmem_low\|alloc_bootmem_pages\|alloc_bootmem_low_pages\)(...) .. when != E - memset(E,0,E1); // Signed-off-by: Julia Lawall Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 3fadd06ebcbff9b0a7c90f68d81250f39bf31db1 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:32 2008 +0200 m68k/Apollo: remove the unused APOLLO_ELPLUS option Looking at older kernel sources the APOLLO_ELPLUS option was added somewhere during kernel 2.1, but even kernel 2.2.0 does not contain any driver that would be enabled through it... Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 7ccaee5cadd7a771773bbb878e139697511ebdde Author: Adrian Bunk Date: Thu Jul 17 21:16:31 2008 +0200 m68k/Atari: remove the dead ATARI_SCC{,_DMA} options It seems the driver was removed back in kernel 2.3 but the options were forgotten. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 62bc654e794feb5242c31a59dcc36bab64f7d917 Author: Adrian Bunk Date: Thu Jul 17 21:16:30 2008 +0200 m68k/Mac: remove the unused ADB_KEYBOARD option When the driver was removed back in 2002 the option was forgotten. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 635c0a217425f6f37422b85bcc88a7af9efc457c Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:29 2008 +0200 m68k/apollo: Add missing call to apollo_parse_bootinfo() Add the missing call to apollo_parse_bootinfo(), which had been lost from a big Apollo support patch by Peter De Schrijver in 1999. Thanks to Adrian Bunk for noticing! Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a594409a2160070b2185e77b33232cf73a9151a5 Author: Adrian Bunk Date: Thu Jul 17 21:16:28 2008 +0200 m68k: remove stale ARCH_SUN4 #define m68k: remove stale ARCH_SUN4 #define Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 07b8125949de66b6552966de8d4280c3a8620359 Author: Adrian Bunk Date: Thu Jul 17 21:16:27 2008 +0200 m68k/sun3/: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global code static: - config.c: sun3_bootmem_alloc() - config.c: sun3_sched_init() - dvma.c: dvma_page() - idprom.c: struct Sun_Machines[] - mmu_emu.c: struct ctx_alloc[] - sun3dvma.c: iommu_use[] - sun3ints.c: led_pattern[] - remove the unused sbus.c Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 22deb527ce5d13e07652f81a53032aa0214ea8c3 Author: Adrian Bunk Date: Thu Jul 17 21:16:26 2008 +0200 m68k/q40/config.c: make functions static This patch makes the following needlessly global functions static: - q40_reset() - q40_halt() - q40_disable_irqs() - q40_gettimeoffset() - q40_hwclk() - q40_get_ss() - q40_set_clock_mmss() Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8dfbdf4abad6e5a7bbd097bf7e2c0ec41e0c54b4 Author: Adrian Bunk Date: Thu Jul 17 21:16:25 2008 +0200 m68k/mac/: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global code (always) static: - baboon.c: struct baboon - baboon.c: baboon_irq() - config.c: mac_orig_videoaddr - config.c: mac_identify() - config.c: mac_report_hardware() - config.c: mac_debug_console_write() - config.c: mac_sccb_console_write() - config.c: mac_scca_console_write() - config.c: mac_init_scc_port() - oss.c: oss_irq() - oss.c: oss_nubus_irq() - psc.c: psc_debug_dump() - psc.c: psc_dma_die_die_die() - via.c: rbv_clear - remove the unused bootparse.c - #if 0 the following unused functions: - config.c: mac_debugging_short() - config.c: mac_debugging_long() - remove the following unused code: - config.c: mac_bisize - config.c: mac_env - config.c: mac_SCC_init_done - config.c: mac_SCC_reset_done - config.c: mac_init_scca_port() - config.c: mac_init_sccb_port() Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 5575d0a3c9676b2886adad67dd4b2ac126a49f1f Author: Adrian Bunk Date: Thu Jul 17 21:16:24 2008 +0200 m68k/atari/debug.c: possible cleanups This patch contains the following possible cleanups: - make the following needlessly global functions (always) static: - atari_mfp_console_write() - atari_scc_console_write() - atari_midi_console_write() - atari_init_mfp_port() - atari_init_scc_port() - atari_init_midi_port() - #if 0 the following unused functions: - atari_mfp_console_wait_key() - atari_scc_console_wait_key() - atari_midi_console_wait_key() - remove the following unused variables: - atari_MFP_init_done - atari_SCC_init_done Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 0795dbcc4c4c93a929463957993c04cf5fec346c Author: Adrian Bunk Date: Thu Jul 17 21:16:23 2008 +0200 m68k/amiga/: possible cleanups This patch contains the following possible cleanups: - amiints.c: add a proper prototype for amiga_init_IRQ() in include/asm-m68k/amigaints.h - make the following needlessly global code static: - config.c: amiga_model - config.c: amiga_psfreq - config.c: amiga_serial_console_write() - #if 0 the following unused functions: - config.c: amiga_serial_puts() - config.c: amiga_serial_console_wait_key() - config.c: amiga_serial_gets() - remove the following unused variable: - config.c: amiga_masterclock Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 880e5e212ec5ab12411e40c78bd5ac501e9caeed Author: Adrian Bunk Date: Thu Jul 17 21:16:22 2008 +0200 export c2p This patch fixes the following build error: <-- snip --> .. Building modules, stage 2. MODPOST 1203 modules ERROR: "c2p" [drivers/video/amifb.ko] undefined! .. make[2]: *** [__modpost] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8468afc039f03837066132be14cdd9e5fa726f0b Author: Adrian Bunk Date: Thu Jul 17 21:16:21 2008 +0200 export amiga_vblank This patch fixes the following build error: <-- snip --> .. Building modules, stage 2. MODPOST 1203 modules ERROR: "amiga_vblank" [drivers/video/amifb.ko] undefined! .. make[2]: *** [__modpost] Error 1 <-- snip --> Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 8b54b6135a3e6d6e7c7967de7b408fd89afb0333 Author: Adrian Bunk Date: Thu Jul 17 21:16:20 2008 +0200 drivers/video/c2p.c: add MODULE_LICENSE This patch adds the missing MODULE_LICENSE("GPL"). Reported-by: Adrian Bunk Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit da8513c9b84317d1a2071644b6ccf734463d4849 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:19 2008 +0200 atafb: Register Atari-specific video modes with sysfs Register the Atari-specific video modes with sysfs, so you can see them in /sys/class/graphics/fb0/modes and change the video mode by writing to /sys/class/graphics/fb0/mode. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit db3e5289f51b5d02767fa2951d5f0375efdba35c Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:18 2008 +0200 amifb: Register Amiga-specific video modes with sysfs Register the Amiga-specific video modes with sysfs, so you can see them in /sys/class/graphics/fb0/modes and change the video mode by writing to /sys/class/graphics/fb0/mode. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit fa7f28939634c2ea36817a0c3dbd8d84972c1488 Author: akinobu.mita@gmail.com Date: Thu Jul 17 21:16:17 2008 +0200 zorro: use memory_read_from_buffer zorro: use memory_read_from_buffer Signed-off-by: Akinobu Mita Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a6a26a3e652671a783563f1e9697c68bd19c40fc Author: Robert P. J. Day Date: Thu Jul 17 21:16:16 2008 +0200 ZORRO: Replace deprecated __initcall with equivalent device_initcall. ZORRO: Replace deprecated __initcall with equivalent device_initcall. Signed-off-by: Robert P. J. Day Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit d33b4432e634246eef00ef4d425939c253f70dd6 Author: Adrian Bunk Date: Thu Jul 17 21:16:15 2008 +0200 m68k: remove AP1000 code Unless I miss something that's code for a sparc machine even the sparc code no longer supports that got copied to m68k when these files were copied. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit b739912efc02f80cc4dc5eaef07e5bc7eafee1b0 Author: Adrian Bunk Date: Thu Jul 17 21:16:14 2008 +0200 m68k: make multi_defconfig the default defconfig It seems to match the intention behind multi_defconfig to make it the default defconfig. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit a0c14d28df8fcf939a8efd9332ace164e9f931fb Author: Mathieu Desnoyers Date: Thu Jul 17 21:16:13 2008 +0200 Stringify support commas > This is a no-no for those archs that still use -traditional. > > I dunno if this is a problem for you at the moment and the > > right fix is anyway to nuke -traditional. > > > > Sam Signed-off-by: Mathieu Desnoyers Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit edfd92f67eec1bdd905dd7841416eaf945a5b92f Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:12 2008 +0200 m68k: Allow no CPU/platform type for allnoconfig Allow no CPU/platform type for allnoconfig - Provide a dummy value for FPSTATESIZE if no CPU type was selected - Provide a dummy value for NR_IRQS if no platform type was selected - Warn the user if no CPU or platform type was selected Note: you still cannot build an allnoconfig kernel, as CONFIG_SWAP=n doesn't build and we cannot easily fix that (http://groups.google.com/group/linux.kernel/browse_thread/thread/d430c78b07e1827b) Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 97d26e73d729c8d967bc5eb9086321956c444dd4 Author: Cyrill Gorcunov Date: Thu Jul 17 21:16:11 2008 +0200 m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro This patch includes page.h header into linker script that allow us to use PAGE_SIZE macro instead of numeric constant Signed-off-by: Cyrill Gorcunov Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit e945b568e28b42de893ef24989372f0219501d32 Author: Geert Uytterhoeven Date: Thu Jul 17 21:16:10 2008 +0200 m68k: Return -ENODEV if no device is found According to the tests in do_initcalls(), the proper error code in case no device is found is -ENODEV, not -ENXIO or -EIO. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 038eddd9acf34e8202b31af3ee9eb48179114323 Author: Paulius Zaleckas Date: Thu Jul 17 21:16:09 2008 +0200 ariadne: use netstats in net_device structure Use net_device_stats from net_device structure instead of local. Signed-off-by: Paulius Zaleckas Signed-off-by: Geert Uytterhoeven Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit f30828a6745281edda735f642b5f814e1123ecd3 Author: Adrian Bunk Date: Thu Jul 17 21:16:08 2008 +0200 m68k: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit f7df406dce01dfd30d7e0c570a928bcfeff03142 Merge: 5e248ac... a6795e9... Author: Linus Torvalds Date: Sun Jul 20 17:17:52 2008 -0700 Merge branch 'configfs-fixup-ptr-error' of git://oss.oracle.com/git/jlbec/linux-2.6 * 'configfs-fixup-ptr-error' of git://oss.oracle.com/git/jlbec/linux-2.6: configfs: Allow ->make_item() and ->make_group() to return detailed errors. Revert "configfs: Allow ->make_item() and ->make_group() to return detailed errors." commit 5e248ac9a5c465b356b936030d5a2e80887eb266 Author: Thomas Gleixner Date: Fri Jul 18 02:07:02 2008 +0200 APCI: revert another duplicated patch commit d1857056904d5f313f11184fcfa624652ff9620a ("ACPI: don't walk tables if ACPI was disabled") is another superfluous duplicate commit caused by git -> quilt -> git conversion. Revert it. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 392798a17b6afba5928bc577aeb7bc83a1585534 Author: Thomas Gleixner Date: Fri Jul 18 01:11:38 2008 +0200 APCI: revert duplicated patch commit 816c2eda3ce8fa7eb62f22e01e2ec7a3f7d677c0 ("dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.") was merged between 2.6.26-rc8 and -rc9) Due to rebasing the ACPI tree via quilt the same patch got applied again via commit cc7e51666d82aedfd6b9a033ca1a10d71c21f1ca ("dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.") Revert it, as it is obviously bogus. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 4e4f64da58bc71a139722bb5013adda0f7ca4e78 Author: Alan Cox Date: Wed Jul 16 21:57:28 2008 +0100 Fix strip driver back up for ldisc/tty changes Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 44b7d1b37f786c61d0e382b6f72f605f73de284b Author: Alan Cox Date: Wed Jul 16 21:57:18 2008 +0100 tty: add more tty_port fields Move more bits into the tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 593573bc55c9e1999b9679da4e477c0220a6fbbd Author: Alan Cox Date: Wed Jul 16 21:57:10 2008 +0100 termios: Termios defines for other platforms Fix up the termios of the people who have not yet got with the program Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 77451e53e0a509a98eda272567869cfe96431ba9 Author: Alan Cox Date: Wed Jul 16 21:57:02 2008 +0100 cyclades: use tty_port Switch cyclades to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit ae67751785dae388beb31fc24d14870d0d4669d9 Author: Alan Cox Date: Wed Jul 16 21:56:54 2008 +0100 tty: Clean up tiocmset Reverse the order of one test and it gets much more readable Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 8fb06c771399b8d51d724756411108e9abe2a85a Author: Alan Cox Date: Wed Jul 16 21:56:46 2008 +0100 synclink: use tty_port Switch the synclink ports to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f8ae47641611fcdf175ab8bbe89054731b16971d Author: Alan Cox Date: Wed Jul 16 21:56:37 2008 +0100 stallion: use tty_port Switch the stallion driver to use the tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b1d1619b4a53072f19e41b1def71fd223fc5d780 Author: Haavard Skinnemoen Date: Wed Jul 16 21:56:29 2008 +0100 atmel_serial: Fix tty_port breakage The tty pointer has been moved into a tty_port field, so we need to use ->info->port.tty instead of just ->info->tty. Fixes these build errors: David Brownell wrote: > drivers/serial/atmel_serial.c: In function 'atmel_rx_from_ring': > drivers/serial/atmel_serial.c:665: error: 'struct uart_info' has no member named 'tty' > drivers/serial/atmel_serial.c: In function 'atmel_rx_from_dma': > drivers/serial/atmel_serial.c:672: error: 'struct uart_info' has no member named 'tty' > drivers/serial/atmel_serial.c: In function 'atmel_startup': > drivers/serial/atmel_serial.c:797: error: 'struct uart_info' has no member named 'tty' > make[2]: *** [drivers/serial/atmel_serial.o] Error 1 Signed-off-by: Haavard Skinnemoen Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e60a10844879794c7b592acf123cbf9ea0e2c0e7 Author: Alan Cox Date: Wed Jul 16 21:56:18 2008 +0100 rocket: use tty_port Switch the rocketport to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0ad9e7d1d6bf7829912be50d24d4f3f473006326 Author: Alan Cox Date: Wed Jul 16 21:56:10 2008 +0100 mxser: use tty_port Switch mxser to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9de6a51fee08f9e7020074738150441305e83af2 Author: Alan Cox Date: Wed Jul 16 21:56:02 2008 +0100 moxa: use tty_port Switch MOXA to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b02f5ad6a3ff5a1ee2a7b8ec6eee338de553b060 Author: Alan Cox Date: Wed Jul 16 21:55:53 2008 +0100 istallion: use tty_port Switch istallion to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit f1d03228ea85877584d41bccf62841e7ca47043c Author: Alan Cox Date: Wed Jul 16 21:55:45 2008 +0100 isicom: use tty_port Switch isicom to use a tty_port structure for some fields Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d99101fda034922d5ecaa735910e9930f076325f Author: Alan Cox Date: Wed Jul 16 21:55:37 2008 +0100 riscom8: remove bogus checks Chris Malley posted a patch removing a NULL check in the riscom8 driver. Further analysis shows that even more of the tests are irrelevant so we can delete lots of stuff Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 85f8f81052eeb3eac1242731a8777caacfef0aa9 Author: Alan Cox Date: Wed Jul 16 21:55:29 2008 +0100 riscom8: use tty_port Switch riscom8 to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b5391e29f428d11755ca2c91074c6db6f5c69d7c Author: Alan Cox Date: Wed Jul 16 21:55:20 2008 +0100 gs: use tty_port Switch drivers using the old "generic serial" driver to use the tty_port structures Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 4982d6b37a5ccebe6c2af79970c7a15c1939243a Author: Alan Cox Date: Wed Jul 16 21:55:11 2008 +0100 esp: use tty_port Switch esp to use the new tty_port structures Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 52d417388d154f68f8ab753de03b1fba1814de81 Author: Alan Cox Date: Wed Jul 16 21:55:02 2008 +0100 epca: use tty_port Switch the EPCA driver to include and begin using a tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 7a4d29f426f17479395980ded8fa5e3bdd6d94e4 Author: Alan Cox Date: Wed Jul 16 21:54:54 2008 +0100 tty.h: clean up Coding style clean up and white space tidy Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a88487c79bfefb715030c5baa68fbedc1b8732e8 Author: Takashi Iwai Date: Wed Jul 16 21:54:42 2008 +0100 Fix compile errors in SGI console drivers (linux-next tree) The below is the patch to replace blindly all possible places, including Jack's fixes. Signed-off-by: Takashi Iwai (Reviewed and checked rather than blindly added) Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit b1ca7e7a0b35874b2a9cae60f8f5b78df575faa7 Author: Jack Steiner Date: Wed Jul 16 21:54:31 2008 +0100 - Fix compile errors in SGI console drivers (linux-next tree) Fix compile errors in SGI console drivers caused by changes to the tty_port structures in the linux-next tree. Signed-off-by: Jack Steiner Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 87c25ef0a41ad7a8249cd3009bf65deb700d4ee3 Author: Stephen Rothwell Date: Wed Jul 16 21:54:22 2008 +0100 ttydev: fix pamc_zilog for tty pointer move Today's linux-next build (powerpc allyesconfig) failed like this: drivers/serial/pmac_zilog.c: In function 'pmz_receive_chars': drivers/serial/pmac_zilog.c:245: error: 'struct uart_info' has no member named 'tty' drivers/serial/pmac_zilog.c:250: error: 'struct uart_info' has no member named 'tty' I applied the patch below (which builds but may, or may not, be correct). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ Signed-off-by: Stephen Rothwell Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 2f7a697a13a189a7ef43a9b6bfc3fc6e359d96fb Author: Stephen Rothwell Date: Wed Jul 16 21:54:11 2008 +0100 ttydev: fix pamc_zilog for tty pointer move Today's linux-next build (sparc64 defconfig) failed like this: drivers/serial/sunhv.c: In function `receive_chars': drivers/serial/sunhv.c:188: error: structure has no member named `tty' drivers/serial/sunsu.c: In function `receive_chars': drivers/serial/sunsu.c:314: error: structure has no member named `tty' drivers/serial/sunsab.c: In function `receive_chars': drivers/serial/sunsab.c:121: error: structure has no member named `tty' I applied the following patch (which, again, may not be correct). Signed-off-by: Stephen Rothwell Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 34492b5834ede63d896c93ccba9a4657a8435dc2 Author: David Howells Date: Wed Jul 16 21:54:01 2008 +0100 MN10300: Fix MN10300's serial port driver to get at its tty_struct Fix MN10300's serial port driver to get at its tty_struct as this moved from struct uart_info into struct tty_port in patch: Signed-off-by: David Howells Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit df4f4dd429870f435f8d5d9d561db029a29f063b Author: Alan Cox Date: Wed Jul 16 21:53:50 2008 +0100 serial: use tty_port Switch the serial_core based drivers to use the new tty_port structure. We can't quite use all of it yet because of the dynamically allocated extras in the serial_core layer. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 6f67048cd010afe19d79d821f16055d9c704c6f0 Author: Alan Cox Date: Wed Jul 16 21:53:41 2008 +0100 tty: Introduce a tty_port common structure Every tty driver has its own concept of a port structure and because they all differ we cannot extract commonality. Begin fixing this by creating a structure drivers can elect to use so that over time we can push fields into this and create commonality and then introduce common methods. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit d87a6d951c6c09d191d9c10903deb3cc353fcd2c Author: Adrian Bunk Date: Wed Jul 16 21:53:31 2008 +0100 drivers/serial/: remove CVS keywords This patch removes CVS keywords that weren't updated for a long time in comments, printk's and MODULE_DESCRIPTION's (no printk's or MODULE_DESCRIPTION's are completely removed). While doing this I also found and fixed a missing \n in a printk in m32r_sio.c Signed-off-by: Adrian Bunk Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 59247ca2fdca9691a6a7df532a830e3a133d9962 Author: Adrian Bunk Date: Wed Jul 16 21:53:22 2008 +0100 drivers/char/rio/: remove VCS tags This patch removes ancient VCS tags (either protected by #ifdef SCCS_LABELS or commented out). Signed-off-by: Adrian Bunk Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a352def21a642133758b868c71bee12ab34ad5c5 Author: Alan Cox Date: Wed Jul 16 21:53:12 2008 +0100 tty: Ldisc revamp Move the line disciplines towards a conventional ->ops arrangement. For the moment the actual 'tty_ldisc' struct in the tty is kept as part of the tty struct but this can then be changed if it turns out that when it all settles down we want to refcount ldiscs separately to the tty. Pull the ldisc code out of /proc and put it with our ldisc code. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e1e5770bb63fb9d71619a68f52cb0ba4b2ae58a6 Author: Jiri Slaby Date: Wed Jul 16 21:52:56 2008 +0100 tty: isicom, enable/disable pci device Don't forget to enable and disable PCI devices. The device might be unusable without that. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 9afd561acabe5059ff16d163a176e2350269aba5 Author: Haavard Skinnemoen Date: Wed Jul 16 21:52:46 2008 +0100 Subject: [PATCH 2/2] atmel_serial: Implement flush_buffer() hook Avoid dumping garbage to the serial port when the tty is flushed. This tends to happen when rebooting from a serial console. Signed-off-by: Haavard Skinnemoen Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 6bb0e3a59a089e23eecc0af3b6f6012b2a9affba Author: Haavard Skinnemoen Date: Wed Jul 16 21:52:36 2008 +0100 Subject: [PATCH 1/2] serial: Add flush_buffer() operation to uart_ops Serial drivers using DMA (like the atmel_serial driver) tend to get very confused when the xmit buffer is flushed and nobody told them. They also tend to spew a lot of garbage since the DMA engine keeps running after the buffer is flushed and possibly refilled with unrelated data. This patch adds a new flush_buffer operation to the uart_ops struct, along with a call to it from uart_flush_buffer() right after the xmit buffer has been cleared. The driver can implement this in order to syncronize its internal DMA state with the xmit buffer when the buffer is flushed. Signed-off-by: Haavard Skinnemoen Acked-by: Alan Cox Signed-off-by: Linus Torvalds commit 15648f154a8faea97cbe931e189cf0a57fd066f4 Author: Alan Cox Date: Wed Jul 16 21:52:25 2008 +0100 simserial: Fix up for ldisc changes Noted by Tony Luck although I've done the patches differently and also removed some other bogus oddments. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit e6b51632b3579d96ce5aa1b3efdeceedd2921a2c Author: Dave Airlie Date: Mon Jul 21 08:42:36 2008 +1000 gpu: re-order GPU subdirectory vs char for AGP vs DRM startup. Signed-off-by: Dave Airlie commit 99cdb0c8c5e0e43652d25951a85bac82a1231591 Author: Philipp Zabel Date: Thu Jul 10 02:17:02 2008 +0200 mfd: let asic3 use mem resource instead of bus_shift The bus_shift parameter in platform_data is not needed as we can tell the driver with the IOMEM_RESOURCE whether the ASIC is located on a 16bit or 32bit memory bus. The htc-egpio driver uses a more descriptive bus_width parameter, but for drivers where the register map size fixed, we don't even need this. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 279cac484e55317456900fe3567c7cb5bd46fd5f Author: Philipp Zabel Date: Thu Jul 10 02:16:27 2008 +0200 mfd: remove DS1WM register definitions from asic3.h There is a dedicated ds1wm driver, no need to duplicate this information here. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit 4a67b528e0be5d855b1a7bb71ec769d954765f6c Author: Philipp Zabel Date: Thu Jul 3 12:27:32 2008 +0200 mfd: add ASIC3_CONFIG_GPIO templates As ASIC3 GPIO alternate function configuration is expected to be similar for several devices, it is convenient to define descriptive macros. This patch is inspired by the PXA MFP configuration, the alternate functions were observed on hx4700 and blueangel. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz commit de0d23c12c42317c273919b597f6822af2102e55 Author: Philipp Zabel Date: Thu Jul 3 11:08:27 2008 +0200 mfd: fix the asic3 irq demux code Wrong irq numbers were given to desc->handle_irq, which on some devices caused endless loops (asic3_irq_demux calling itself, basically). Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 30250b457f30ca655d37ad1a1587221ff6eefc91 Author: Samuel Ortiz Date: Tue Jun 24 23:37:09 2008 +0200 mfd: asic3 should depend on gpiolib Now that asic3 implements the gpiolib API, it should depend on it at build time. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 786bef3768a6ea1070526983b20e316c4eacd854 Author: Philipp Zabel Date: Tue Jun 24 01:31:24 2008 +0200 mfd: fix asic3 config array initialisation Our memset length was incorrect. Tested-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 065032f61bd9acdb843766da3149de12eaf87c0b Author: Philipp Zabel Date: Sat Jun 21 00:51:38 2008 +0200 mfd: move asic3 probe functions into __init section Potentially free some memory by moving the _probe functions into __init. Signed-off-by: Philipp Zabel Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 3b8139f8b1457af7b5295d97050b3f9a2545a17a Author: Samuel Ortiz Date: Fri Jun 20 11:12:21 2008 +0200 mfd: Use uppercase only for asic3 macros and defines Let's be consistent and use uppercase only, for both macro and defines. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 24f4f2eef2714bddd6fdb823be53fc2ee69699e0 Author: Samuel Ortiz Date: Fri Jun 20 11:11:19 2008 +0200 mfd: use dev_* macros for asic3 debugging We replace the various printks, and use the dev_* macros instead. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 3b26bf17226f66bfd6cd4e36ac81f83fe994043a Author: Samuel Ortiz Date: Fri Jun 20 11:09:51 2008 +0200 mfd: New asic3 gpio configuration code The ASIC3 GPIO configuration code is a bit obscure and hardly readable. This patch changes it so that it is now more readable and understandable, by being more explicit. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 1effe5bc6cfbac4506d7944d68dadbd29ad62645 Author: Samuel Ortiz Date: Fri Jun 20 11:07:39 2008 +0200 mfd: asic3 children platform data removal Platform devices should be dynamically allocated, and each supported device should have its own platform data. For now we just remove this buggy code. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit 6f2384c4bdd4be3dc1e5d22ed5e6f0c3076fda60 Author: Samuel Ortiz Date: Fri Jun 20 11:02:19 2008 +0200 mfd: asic3 gpiolib support ASIC3 is, among other things, a GPIO extender. We should thus have it supporting the current gpiolib API. Signed-off-by: Samuel Ortiz Signed-off-by: Andrew Morton commit fb65a7c091529bfffb1262515252c0d0f6241c5c Author: David S. Miller Date: Sun Jul 20 10:18:44 2008 -0700 iucv: Fix bad merging. Noticed by Stephen Rothwell. Signed-off-by: David S. Miller commit cb7f39d2bc5a20615d016dd86fca0fd233c13b5d Author: Yoichi Yuasa Date: Sun Jul 20 22:03:32 2008 +0900 [MIPS] Remove unused maltasmp.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 3d739f2daaed442f5bee9da2164757401ae4a417 Author: Yoichi Yuasa Date: Sun Jul 20 22:01:06 2008 +0900 [MIPS] Remove unused saa9730_uart.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 8213bbf9c1c0009872a3278aa7a83ec8f3508195 Author: Ralf Baechle Date: Sun Jul 20 13:16:46 2008 +0100 [MIPS] Rename MIPS sys_pipe syscall entry point to something MIPS-specific. Signed-off-by: Ralf Baechle commit 4914ad4a9f2d484a68422700ba8493db73c7c411 Author: Ralf Baechle Date: Sun Jul 20 11:34:39 2008 +0100 [MIPS] 32-bit compat: Delete unused sys_truncate64 and sys_ftruncate64. Signed-off-by: Ralf Baechle commit e0eb730757665d7e8ec0e79d9042a9311f3edb7e Author: Atsushi Nemoto Date: Sat Jul 19 01:51:52 2008 +0900 [MIPS] TXx9: Fix some sparse warnings Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 94a4c32939dede9328c6e4face335eb8441fc18d Author: Atsushi Nemoto Date: Sat Jul 19 01:51:47 2008 +0900 [MIPS] TXx9: Add 64-bit support SYS_SUPPORTS_64BIT_KERNEL is enabled for RBTX4927/RBTX4938, but actually it was broken for long time (or from the beginning). Now it should work. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 255033a9bb900a06c9a7798908ce12557d24fb66 Author: Atsushi Nemoto Date: Sat Jul 19 01:51:41 2008 +0900 [MIPS] TXx9: Cleanups for 64-bit support * Unify (and fix) mem_tx4938.c and mem_tx4927.c * Simplify prom_init * Kill volatiles and unused definitions for tx4927.h and tx4938.h Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b5d5accc7a2eb41f43ef346f3b258ba2f6342a1c Author: Yoichi Yuasa Date: Fri Jul 18 23:03:15 2008 +0900 [MIPS] Cobalt: Fix I/O port resource range LCD and buttons don't use I/O port space. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5f15d378763e88c361364c0d0ad256d523f2d72f Author: Adrian Bunk Date: Wed Jul 16 19:26:15 2008 +0300 [MIPS] don't leak setup_early_printk() in userspace header Our userspace headers shouldn't contain prototypes of in-kernel functions. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit f113c5eda22c349a163ea17ba11bc64727a0f799 Author: Adrian Bunk Date: Wed Jul 16 19:25:50 2008 +0300 [MIPS] Remove include/asm-mips/mips-boards/sead{,int}.h include/asm-mips/mips-boards/sead{,int}.h are now obsolete. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit e76812eddcebe06403934c868f3a707fd5bc167d Author: Adrian Bunk Date: Wed Jul 16 19:25:44 2008 +0300 [MIPS] Remove asm-mips/mips-boards/atlas{,int}.h asm-mips/mips-boards/atlas{,int}.h are now obsolete. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit fc22c3571c86cc36f4eb29336ce40c04a666ee98 Author: Adrian Bunk Date: Wed Jul 16 19:25:40 2008 +0300 [MIPS] mips/sgi-ip22/ip28-berr.c: fix the build Commit 3e6ea3b0d7a93550a93a265e732413d3a5aaf0d2 (linux-mips.org) / 52f4f6bbcff5510f662a002ec1219660ea25af62 (kernel.org) ([MIPS] Use kernel-supplied ARRAY_SIZE() macro.) causes the following compile error: <-- snip --> ... CC arch/mips/sgi-ip22/ip28-berr.o /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c: In function 'ip28_be_interrupt': /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:415: warning: type defaults to 'int' in declaration of 'type name' /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: error: subscripted value is neither array nor pointer /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/sgi-ip22/ip28-berr.c:424: warning: type defaults to 'int' in declaration of 'type name' make[2]: *** [arch/mips/sgi-ip22/ip28-berr.o] Error 1 <-- snip --> Using ARRAY_SIZE in these places in arch/mips/sgi-ip22/ip28-berr.c was bogus, and therefore gets reverted by this patch. Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit 8d795f2a5cf73338a467ac82bdeb73225e987c45 Author: Atsushi Nemoto Date: Fri Jul 18 00:43:48 2008 +0900 [MIPS] TXx9: Miscellaneous build fixes * Fix build if only RBTX4927 or RBTX4938 was selected. * Move gpio helpers to generic part. * Select SOC_TX4938 for RBTX4927/37 board. * Fix parent of rbtx4938_fpga_resource. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 73b4390fb23456964201abda79f1210fe337d01a Author: Ralf Baechle Date: Wed Jul 16 16:12:25 2008 +0100 [MIPS] Routerboard 532: Support for base system Signed-off-by: Phil Sutter Signed-off-by: Florian Fainelli Signed-off-by: Ralf Baechle commit 36a0a3cd45b49ceff78ac28efef1cbeec413d8c2 Author: Thomas Bogendoerfer Date: Wed Jul 16 15:18:58 2008 +0200 [MIPS] IP32: Use common SGI button driver Use the Indy/O2 button driver. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 5a334fa9240411121f5dda9605fc7fd98429e8c5 Author: Thomas Bogendoerfer Date: Wed Jul 16 15:18:54 2008 +0200 [MIPS] IP22: Use common SGI button driver Use the Indy/O2 button driver. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 36e5c21de51e83bfa17c1e7334050edd2eda3d47 Author: Thomas Bogendoerfer Date: Wed Jul 16 14:06:15 2008 +0200 [MIPS] IP22, IP28: Fix merge bug Instead of one SGI_HAS_HAL2 for IP22 and one for IP28, IP28 got two of them... Let's give IP22 some ALSA sound, too. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle [MIPS] IP22, IP28: Fix merge bug Instead of one SGI_HAS_HAL2 for IP22 and one for IP28, IP28 got two of them... Let's give IP22 some ALSA sound, too. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit d6d8a4635a8451ca3c6fa2aaf9bbf934d8e2097b Author: Ralf Baechle Date: Wed Jul 16 12:07:05 2008 +0100 [MIPS] Tinker with constraints in to fix build error. [...] CC init/main.o include/asm/bitops.h: In function `start_kernel': include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: warning: asm operand 2 probably doesn't match constraints include/asm/bitops.h:76: error: impossible constraint in `asm' include/asm/bitops.h:76: error: impossible constraint in `asm' include/asm/bitops.h:76: error: impossible constraint in `asm' make[1]: *** [init/main.o] Error 1 [...] The build error is caused by the ages old gcc bug where gcc at the time of analyzing the constraints is unable to figure out that an "i" constraint actually can be satisfied and thus will abort unless an "r" is added to the constraint. For the actual code generation gcc will only ever use the "i" constraint. Signed-off-by: Ralf Baechle commit c29d150305f7f655b7002cc31754c605e5c0d1a0 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:32 2008 +0300 [MIPS] Add missing prototypes to asm/page.h This patch fixes the following sparse warnings: >>>>>>>>>>>>>>>>>> arch/mips/mm/page.c:284:16: warning: symbol 'build_clear_page' was not declared. Should it be static? arch/mips/mm/page.c:426:16: warning: symbol 'build_copy_page' was not declared. Should it be static? >>>>>>>>>>>>>>>>>> The fix is to add appropriate prototypes to the header include/asm-mips/page.h. Build-tested against Malta defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit f028b8605613ade67fda554e30d367911d6c7222 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:31 2008 +0300 [MIPS] Fix missing prototypes in asm/fpu.h While building the Malta defconfig, sparse spat the following warnings: >>>>>>>>>>>>>>>>>> arch/mips/math-emu/kernel_linkage.c:31:6: warning: symbol 'fpu_emulator_init_fpu' was not declared. Should it be static? arch/mips/math-emu/kernel_linkage.c:54:5: warning: symbol 'fpu_emulator_save_context' was not declared. Should it be static? arch/mips/math-emu/kernel_linkage.c:68:5: warning: symbol 'fpu_emulator_restore_context' was not declared. Should it be static? >>>>>>>>>>>>>>>>>> This patch fixes these errors by adding the proper prototypes to the include/asm-mips/fpu.h header, and actually using this header in the sparse-spotted source file. Build-tested with Malta defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 3450004a8cec8bab246372a1cabb9c2483b1e6c3 Author: Dmitri Vorobiev Date: Tue Jul 15 19:57:30 2008 +0300 [MIPS] PCI: Make the pcibios_max_latency variable static The pcibios_max_latency variable is needlessly defined global, and this patch makes it static. Build-tested using malta_defconfig. Signed-off-by: Dmitri Vorobiev Signed-off-by: Ralf Baechle commit 597a5f551ec4cd0aa0966e4fff4684ecc8c31c0d Author: Avi Kivity Date: Sun Jul 20 14:24:22 2008 +0300 KVM: Adjust smp_call_function_mask() callers to new requirements smp_call_function_mask() now complains when called in a preemptible context; adjust its callers accordingly. Signed-off-by: Avi Kivity commit d20b27478d6ccf7c4c8de4f09db2bdbaec82a6c0 Author: Jean-Francois Moine Date: Fri Jul 18 05:52:04 2008 -0300 V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit fac3639d886ae577d74e2da16e6a448620d432c9 Author: Hans Verkuil Date: Fri Jul 18 10:07:10 2008 -0300 V4L/DVB (8414): videodev/cx18: fix get_index bug and error-handling lock-ups Fix a bug in get_index that was introduced earlier. Also fix two error handling lock-ups in videodev and cx18 that where found thanks to that bug. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f19ad390146e7745cbc529f3bef8469cf21f3a6b Author: Hans Verkuil Date: Fri Jul 18 02:02:50 2008 -0300 V4L/DVB (8411): videobuf-dma-contig.c: fix 64-bit build for pre-2.6.24 kernels Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 86751b016ff4eb4741b602933e5e6d74ac6cc377 Author: Hans Verkuil Date: Fri Jul 18 01:35:14 2008 -0300 V4L/DVB (8410): sh_mobile_ceu_camera: fix 64-bit compiler warnings Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit af8b303e96ed5a6882419c8e632df166bde85d7a Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:36:08 2008 -0300 V4L/DVB (8397): video: convert select VIDEO_ZORAN_ZR36060 into depends on Signed-off-by: Mauro Carvalho Chehab commit 367394ac5cce83d40e605b5c75ee27dbe3d42d92 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:34:27 2008 -0300 V4L/DVB (8396): video: Fix Kbuild dependency for VIDEO_IR_I2C Instead of letting VIDEO_IR_I2C to be selected by VIDEO_IR, if I2C, convert it into a symbol that depends on both VIDEO_IR and I2C. Signed-off-by: Mauro Carvalho Chehab commit 1c22dad8ab86caef7a1f01cf3e9bb446a448aac5 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:31:29 2008 -0300 V4L/DVB (8395): saa7134: Fix Kbuild dependency of ir-kbd-i2c Currently, saa7134 is dependent of ir-kbd-i2c, since it uses a symbol that is defined there. However, as this symbol is used only on saa7134, there's no sense on keeping it defined there (or on ir-commons). So, let's move it to saa7134 and remove one symbol for being exported. Signed-off-by: Mauro Carvalho Chehab commit 4db16db4f60ce063435bd08b71c82aad1254cd95 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:28:56 2008 -0300 V4L/DVB (8394): ir-common: CodingStyle fix: move EXPORT_SYMBOL_GPL to their proper places Signed-off-by: Mauro Carvalho Chehab commit 432aa3b64d08f1453e2742d20c5fe6946ca22549 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:27:50 2008 -0300 V4L/DVB (8393): media/video: Fix depencencies for VIDEOBUF VIDEOBUF_DVB depends on VIDEOBUF_CORE, not on VIDEOBUF_DMA_SG Signed-off-by: Mauro Carvalho Chehab commit d4216488c0ccf7b659411023903bac7207f0dfb7 Author: Mauro Carvalho Chehab Date: Thu Jul 17 22:25:53 2008 -0300 V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on" Signed-off-by: Mauro Carvalho Chehab commit c3fb62bf927cee771c3bcd5053e393e7df518f28 Author: Hans Verkuil Date: Thu Jul 17 17:48:38 2008 -0300 V4L/DVB (8390): videodev: add comment and remove magic number. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8373a3e512c8ea8e93981d42b0d1efb252be17fa Author: Brandon Philips Date: Tue Jun 24 22:58:25 2008 -0300 V4L/DVB (8389): videodev: simplify get_index() Use Hans Verkuil's suggested method of implementing get_index which doesn't depend on class_for_each_device and instead uses the video_device array. This simplifies the code and reduces its memory footprint. Signed-off-by: Brandon Philips Signed-off-by: Mauro Carvalho Chehab commit 2bc93aa304f10bf94c377a487b09df75eaf88ab6 Author: Hans Verkuil Date: Thu Jul 17 16:45:00 2008 -0300 V4L/DVB (8387): Some cosmetic changes Those changes, together with some proper patches, will allow out-of-tree compilation for for kernels < 2.6.19 Signed-off-by: Mauro Carvalho Chehab commit e3bf20de33b016ac73424a5574177ed46c754be3 Author: Hans Verkuil Date: Thu Jul 17 13:29:49 2008 -0300 V4L/DVB (8381): ov7670: fix compile warnings Signed-off-by: Hans Verkuil Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 9edd350f51a1e81f7f01308a99800cad7770e5cd Author: Hans Verkuil Date: Thu Jul 17 13:22:51 2008 -0300 V4L/DVB (8380): saa7115: use saa7115_auto instead of saa711x as the autodetect driver name. Having an _auto suffix is less ambiguous than a 'saa711x' identifier. It's also used like this in the saa7127 driver. Thanks to Jean Delvare for suggesting this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5daed07401ed27bb2684e803f3f01e3a424ea282 Author: Jean Delvare Date: Thu Jul 17 13:18:31 2008 -0300 V4L/DVB (8379): saa7127: Make device detection optional The saa7127 driver supports all of SAA7126, SAA7127, SAA7128 and SAA1729 devices. Declare all these devices, so that board drivers can tell which device is present, instead of always relying on auto-detection (which needs to write to the chip, eek!). We still need the detection for ivtv, so a special device name "saa7127_auto" can be used when the caller doesn't know exactly which device is present. Signed-off-by: Jean Delvare Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 03b52c36a38eb72548b9408c497ffabd1519eabe Author: Hans Verkuil Date: Thu Jul 17 12:33:08 2008 -0300 V4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_av_std_setup Same issue as for cx25840: this function sets up the standard timings and has nothing to do with VBI setup. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ca130eef2ca185739a440b893e69fe36038b87c9 Author: Hans Verkuil Date: Thu Jul 17 12:26:45 2008 -0300 V4L/DVB (8377): ivtv/cx18: ensure the default control values are correct For several MPEG controls and the volume control the default as returned by VIDIOC_QUERYCTRL was incorrect and did not match the actual initial value. This is now fixed for cx18 and ivtv. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cb5aa1c62df81ba2cdbae7f7ce469b231d43aba6 Author: Hans Verkuil Date: Thu Jul 17 11:08:40 2008 -0300 V4L/DVB (8376): cx25840: move cx25840_vbi_setup to core.c and rename to cx25840_std_setup cx25840_vbi_setup has nothing to do with setting up VBI, but everything with setting up the standard. Move to cx25840-core.c and rename. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5de39b2b1f68253d79f3548ef2d103fd5edae563 Author: Hans de Goede Date: Thu Jul 17 10:34:28 2008 -0300 V4L/DVB (8374): gspca: No conflict of 0c45:6011 with the sn9c102 driver. The sn9c102 driver claims to support usb-ID 0x0c45:0x6011, which is a sn9c102 with ov6650 sensor, but the sn9c102 driver does not support the ov6650 sensor (tested). Also the sn9c102 driver claims to support usb-ID 0x0c45:0x603f, which is a sn9c102 with CISVF10 sensor, but the sn9c102 driver does not support the CISVF10 sensor (not tested). Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 12ff91264ce3e2f24013d667d44ba786f947506c Author: Hans de Goede Date: Thu Jul 17 10:30:56 2008 -0300 V4L/DVB (8373): gspca: Hue, saturation and contrast controls added for sn9c10x ovxxxx. (does not work with ov6650) Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 722103e390bb0a526f71440f44bf7f891614e1d6 Author: Hans de Goede Date: Thu Jul 17 10:24:47 2008 -0300 V4L/DVB (8372): gspca: Small ov6650 fixes. 1) Don't change the red and blue pre-gain's from their defaults 2) Actually make the powerline freq ctrl available to userspace Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c91256c27b9509624df2619271cfca9ec5436f8f Author: Jean-Francois Moine Date: Thu Jul 17 10:12:55 2008 -0300 V4L/DVB (8371): gspca: Webcam 08ca:2050 added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 100f7f2a34ded88e79ecbeaf9ed46c58fbdf339c Author: Jean-Francois Moine Date: Thu Jul 17 09:41:03 2008 -0300 V4L/DVB (8370): gspca: Webcam 0461:0821 added. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 1ff1e48442188b9ae68aef82b66baef89e988cf6 Author: Jean-Francois Moine Date: Thu Jul 17 09:37:57 2008 -0300 V4L/DVB (8369): gspca: Bad initialization of sn9c102 ov7630. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d87616f5a5af028d399f2c3e14c3115c67e415cf Author: Andoni Zubimendi Date: Thu Jul 17 05:35:52 2008 -0300 V4L/DVB (8367): gspca: Light frequency filter / exposure / clean-up for sn9c103 ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a975a5279e39b5bc104cc8329d25a36a25136ad9 Author: Hans de Goede Date: Wed Jul 16 15:29:11 2008 -0300 V4L/DVB (8366): gspca: Better code for ov6650 and ov7630. sonixb: Common code between ov6650 and ov7630. Fix brightness oscillation with ov6650 sensor. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 66f358211d4f8bf1a43e3aef9565c5c1454f73b3 Author: Hans de Goede Date: Wed Jul 16 10:16:28 2008 -0300 V4L/DVB (8364): gspca: Support of powerline frequency for ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 5c6644f305650d3d533b67fc74a96e4a2ea0aa89 Author: Hans de Goede Date: Wed Jul 16 10:00:08 2008 -0300 V4L/DVB (8363): gspca: Bad image size with spca501. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c36260ee27dff9a0236ddaaee0e3524ecd389645 Author: Hans de Goede Date: Wed Jul 16 09:56:07 2008 -0300 V4L/DVB (8362): gspca: Bad offset of the brightness sum in sn9c103 packets. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit b7474cf9f693a83c9a64c8504a08823a34994a2e Author: Andoni Zubimendi Date: Wed Jul 16 08:40:30 2008 -0300 V4L/DVB (8361): gspca: Bad check of i2c write to sn9c10x. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 794af52a4ce5279c52f1467448b9e672a7db37f0 Author: Andoni Zubimendi Date: Wed Jul 16 08:33:14 2008 -0300 V4L/DVB (8360): gspca: Bad initialization of sn9c103 - ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 9a97a2abe44781a13cd2ffc95069a8fd2678da68 Author: Mauro Carvalho Chehab Date: Tue Jul 15 14:23:08 2008 -0300 V4L/DVB (8359): gspca: Adds register aliases for zc03xx registers Thanks to http://zc0302.sourceforge.net/zc0302.php, we have some hints about what each zc3xx register means. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jean-Francois Moine commit 568788a771ee88cc6b5e311a207c09731a6e47f0 Author: Jean-Francois Moine Date: Tue Jul 15 11:46:06 2008 -0300 V4L/DVB (8358): gspca: Better initialization of sn9c120 - ov7660. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit f4d520258d229f093bec6937ec3d632eb95600b4 Author: Hans de Goede Date: Tue Jul 15 09:36:42 2008 -0300 V4L/DVB (8357): gspca: Perfect exposure for sn9c10x, sensor ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 3647fea840c94c04f35215cb75b48613c0af310e Author: Hans de Goede Date: Tue Jul 15 05:36:30 2008 -0300 V4L/DVB (8356): gspca: 352x288 mode fix and source clean-up for Sonix bridges. sonixb: Bad initialization of sensor for 352x288 mode. (from Hans de Goede) sonixj: Clean-up source. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ad5ef80dd79851ea683e2d30ca4ebdc0c043a675 Author: Hans de Goede Date: Mon Jul 14 10:11:42 2008 -0300 V4L/DVB (8354): gspca: Better gain for bridge sn9c10x - sensor ov6650. sonixb: Better gain for ov6650. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 4b972d29bbccc86877221164c7f39d52694d4a81 Author: Andoni Zubimendi Date: Mon Jul 14 09:50:26 2008 -0300 V4L/DVB (8353): gspca: 640x480 for bridge sn9c103 / sensor ov7630. sonixb: 640x480 mode for sn9c103 - ov7630. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 739570bb218bb4607df1f197282561e97a98e54a Author: Jean-Francois Moine Date: Mon Jul 14 09:38:29 2008 -0300 V4L/DVB (8352): gspca: Buffers for USB exchanges cannot be in the stack. gspca: Protect dq_callback() against simultaneous USB exchanges. Temporary buffer for USB exchanges added in the device struct. (all) Use a temporary buffer for all USB exchanges. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 5b77ae7776183d733ec86727bcc34c52a336afd6 Author: Jean-Francois Moine Date: Sat Jul 12 09:28:04 2008 -0300 V4L/DVB (8350): gspca: Conform to v4l2 spec and mutex unlock fix. gspca: Empty the application queues on streamoff ioctl. streamon/off and qbuf ioctls may be done by any application. Don't handle MJPEG pixel format as JPEG. (thanks to Hans de Goede) Authorize reqbufs ioctl when streaming. Bad mutex unlock in poll() when streaming problem. (thanks to Mauro Carvalho Chehab) Don't handle 'webcam disconnected' in stream off. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 51fc8e3bc03aeddc557d3084d08425eb4cb8ed41 Author: Andoni Zubimendi Date: Thu Jul 10 11:12:24 2008 -0300 V4L/DVB (8349): gspca: SN9C103 OV7630 fixes in sonixb. Signed-off-by: Andoni Zubimendi Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit dcef3237b652e1c02093feac0f443485a144f035 Author: Hans de Goede Date: Thu Jul 10 10:40:53 2008 -0300 V4L/DVB (8348): gspca: Add auto gain/exposure to sonixb and tas5110 / ov6650 sensors. sonixb: Do auto gain for tas5110 / ov6650 sensors. pac207: Move the auto_gain function to gspca. gspca: New function gspca_auto_gain_n_exposure(). Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d0d0e39bc5912793405d3f84ffc982fa400e6cc0 Author: Jean-Francois Moine Date: Thu Jul 10 07:06:44 2008 -0300 V4L/DVB (8346): gspca: Bad pixel format of bridge VC0321. vc032x: Light frequency was not initialized. Change the pixel format of bridge VC0321 to V4L2_PIX_FMT_YUV420 ('YU12'). Set a bridge to all webcams. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 326c986207cb2065b9819107caa31efd2bbc48db Author: Magnus Damm Date: Wed Jul 16 23:02:08 2008 -0300 V4L/DVB (8343): soc_camera_platform: Add SoC Camera Platform driver This patch adds a simple platform camera device. Useful for testing cameras with SoC camera host drivers. Only one single pixel format and resolution combination is supported. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 0d3244d6439c8c31d2a29efd587c7aca9042c8aa Author: Magnus Damm Date: Wed Jul 16 22:59:28 2008 -0300 V4L/DVB (8342): sh_mobile_ceu_camera: Add SuperH Mobile CEU driver V3 This is V3 of the SuperH Mobile CEU soc_camera driver. The CEU hardware block is configured in a transparent data fetch mode, frames are captured from the attached camera and written to physically contiguous memory buffers provided by the newly added videobuf-dma-contig queue. Tested on sh7722 and sh7723 processors. Changes since V2: - remove SUPERH Kconfig dependency - move sh_mobile_ceu.h to include/media - add board callback support with enable_camera()/disable_camera() - add support for declare_coherent_memory - rework video memory limit - more verbose error messages Changes since V1: - fixed the CEU driver to work with the newly updated patches Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 2cc45cf25a2c14da6d18b7570a23ec09fb8f439a Author: Magnus Damm Date: Wed Jul 16 21:33:39 2008 -0300 V4L/DVB (8341): videobuf: Add physically contiguous queue code V3 This is V3 of the physically contiguous videobuf queues patch. Useful for hardware such as the SuperH Mobile CEU which doesn't support scatter gatter bus mastering. Since it may be difficult to allocate large chunks of physically contiguous memory after some uptime due to fragmentation, this code allocates memory using dma_alloc_coherent(). Architectures supporting dma_declare_coherent_memory() can easily avoid fragmentation issues by using dma_declare_coherent_memory() to force dma_alloc_coherent() to allocate from a certain pre-allocated memory area. Changes since V2 - use dma_handle for physical address - use "scatter gather" instead of "scatter gatter" Changes since V1: - use dev_err() instead of pr_err() - remember size in struct videobuf_dma_contig_memory - keep struct videobuf_dma_contig_memory in .c file - let videobuf_to_dma_contig() return dma_addr_t - implement __videobuf_sync() - return statements, white space and other minor fixes Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 5d6aaf50e2986d3289d16fc2859c490c66a1be63 Author: Magnus Damm Date: Wed Jul 16 21:27:49 2008 -0300 V4L/DVB (8340): videobuf: Fix gather spelling Use "scatter gather" instead of "scatter gatter". Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit b15cf1fcceb92247051dedb502692d56adaa428d Author: Magnus Damm Date: Fri Jul 11 21:03:25 2008 -0300 V4L/DVB (8339): soc_camera: Add 16-bit bus width support The SuperH Mobile CEU hardware supports 16-bit width bus, so extend the soc_camera code with SOCAM_DATAWIDTH_16. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit a034d1b76b173b37f9a3646aa8f50a2c14a0f3ea Author: Magnus Damm Date: Fri Jul 11 20:59:34 2008 -0300 V4L/DVB (8338): soc_camera: Move spinlocks This patch moves the spinlock handling from soc_camera.c to the actual camera host driver. The spinlock_alloc/free callbacks are replaced with code in init_videobuf(). So far all camera host drivers implement their own spinlock_alloc/free methods anyway, and videobuf_queue_core_init() BUGs on a NULL spinlock argument, so, new camera host drivers will not forget to provide a spinlock when initialising their videobuf queues. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 092d3921195c4553a1818e698cee7a281ab361f4 Author: Paulius Zaleckas Date: Fri Jul 11 20:50:31 2008 -0300 V4L/DVB (8337): soc_camera: make videobuf independent Makes SoC camera videobuf independent. Includes all necessary changes for PXA camera driver (currently the only driver using soc_camera in the mainline). These changes are important for the future soc_camera based drivers. Signed-off-by: Paulius Zaleckas Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 439d0e4250b6fc9df3fc9183db38cf8a23d4ad93 Author: Oliver Endriss Date: Tue Jul 15 19:52:22 2008 -0300 V4L/DVB (8335): dvb-ttpci: Fix build with CONFIG_INPUT_EVDEV=n (Bug #11042) Fix build with CONFIG_INPUT_EVDEV=n (Bug #11042). Thanks to Toralf Förster for reporting. Thanks-to: Toralf Förster Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 4ee48c4257d842a29c032a32a19a3fcdd004b83f Author: Oliver Endriss Date: Tue Jul 15 19:36:46 2008 -0300 V4L/DVB (8334): tda10023: Fix typo in tda10023_attach dummy routine Fix compiler warning caused by a typo in the tda10023_attach dummy routine. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 02fa272fcb6edda9059d6dbaab20dfe919f4f4d2 Author: Andy Walls Date: Sun Jul 13 19:30:15 2008 -0300 V4L/DVB (8332): cx18: Suport external reset of the Z8F0811 IR controller on HVR-1600 for lirc cx18: added in cx18_ir_reset_gpio function for lirc_pvr150 like module. Also added the ability to reset the IR chip via ioctl like ivtv. This needs the mutex to protect gpio_dir and gpio_val in struct cx18 as gpio changes can come from a few different asynchronous sources now. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 8abdd00dcc6a58cab3afe6a23a0ce819dc08049a Author: Andy Walls Date: Sun Jul 13 19:05:25 2008 -0300 V4L/DVB (8331): cx18: Add locking for struct cx18 GPIO state variables cx18: Add locking for struct cx18 GPIO state variables in anticpation of adding IR microcontroller reset support for use by external IR modules. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 2c6a37bb076b9718c6362d4ffa1c7e58fdb1a0e9 Author: Michael Krufky Date: Sat Jul 12 22:58:24 2008 -0300 V4L/DVB (8326): sms1xxx: fix missing #include Fix the build error: smscoreapi.c:689: error: 'uintptr_t' undeclared Thanks to Peter Schlaf for reporting this. Cc: Peter Schlaf Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f1f74aa2cf7f109b2eaf3502b8bd13bf40bf6633 Author: Michael Krufky Date: Sat Jul 12 00:37:08 2008 -0300 V4L/DVB (8322): sms1xxx: fix improper usage of asm/foo.h Fix the following warnings generated by checkpatch.pl: WARNING: Use #include instead of 251: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:30: +#include WARNING: Use #include instead of 1566: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:29: +#include Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0b17d0edbc22eda3d0407f98ce4f16ceefb9a97f Author: Hermann Pitton Date: Sat Jul 12 12:27:59 2008 -0300 V4L/DVB (8319): saa7134: Add support for analog only ASUSTeK P7131 saa7134: add a separate entry for the ASUSTeK P7131 analog only and do some eeprom detection to escape from the TVFM7135 with the same PCI subsystem on auto detection. Signed-off-by: Hermann Pitton Signed-off-by: Mauro Carvalho Chehab commit cd257a6f4dd908d94e504d2431710f0fcfe62036 Author: Daniel Drake Date: Mon Jun 30 20:57:39 2008 -0300 V4L/DVB (8318): OV7670: don't reject unsupported settings For VIDIOC_G_FMT/VIDIOC_TRY_FMT, the V4L2 API spec states: "Drivers should not return an error code unless the input is ambiguous" "Very simple, inflexible devices may even ignore all input and always return the default parameters." "When the requested buffer type is not supported drivers return an EINVAL error code." i.e. returning errors for unsupported fields is bad, and it's ok to unconditionally overwrite user-requested settings This patch makes ov7670 meet that behaviour, and brings it in line with other drivers e.g. stk-webcam. It also fixes compatibility with (unpatched) gstreamer. Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 3f8d6f73da4332b4ff4150b9bae8e5f680bcbbde Author: Dean Anderson Date: Mon Jun 30 21:28:34 2008 -0300 V4L/DVB (8317): Sensoray 2255 V4l driver checkpatch fixes This patch fixes some coding style issues. It also fixes a NULL de-reference on driver unload. The permissions for the module parameters were changed to 0644. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 91a1d912f61b91e44336efe100a2bd0821777e24 Author: Jean Delvare Date: Wed Jul 2 16:01:21 2008 -0300 V4L/DVB (8316): bt819: Fix a debug message Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 203c204b39fef2c1c99e4b39e61ba292aa60142a Author: Jean Delvare Date: Wed Jul 2 15:59:29 2008 -0300 V4L/DVB (8315): zr36067: Delete dead code This has been commented out for years, it's about time to get rid of it. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 44f71c3fcefbfea3628cca52c0a177252cf83b60 Author: Michael Krufky Date: Sat Jun 28 23:55:36 2008 -0300 V4L/DVB (8313): sms1xxx: add support for Hauppauge WinTV-Nova-T-MiniStick Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a745f0a12cab631b92f9e13b31997192c7df3823 Author: Michael Krufky Date: Tue Jul 1 04:47:10 2008 -0300 V4L/DVB (8312): sms1xxx: add firmware filenames to board properties for stellar and nova Assign the following firmware filenames: sms1xxx-stellar-dvbt-01.fw sms1xxx-nova-a-dvbt-01.fw sms1xxx-nova-b-dvbt-01.fw Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1fbc3caff47785aca67b4bd5b29c04f3f20c770e Author: Michael Krufky Date: Tue Jul 1 04:35:26 2008 -0300 V4L/DVB (8311): sms1xxx: support device-specific firmware filenames on stellar usb1 sticks Add the capability to define device-specific firmware filenames for the SMS1010, with a mechanism to fall back to the generic firmware if the device-specific firmware is not present. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b1d8f9f5b8036b61a7ec562dfb86361f5b18e8f2 Author: Michael Krufky Date: Sun Jun 29 15:15:19 2008 -0300 V4L/DVB (8310): sms1xxx: remove kmutex_t typedef remove typedef struct mutex kmutex_t fix one line > 80 columns Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4411d29165d83a4a73ea351ffccfdc0fd8baeb1e Author: Michael Krufky Date: Sun Jun 29 14:45:37 2008 -0300 V4L/DVB (8309): sms1xxx: fix OOPS on 64 bit kernels due to a bad cast Fix the following build warning: smscoreapi.c: In function 'smscore_detect_mode': smscoreapi.c:689: warning: cast from pointer to integer of different size smscoreapi.c:689: warning: cast to pointer from integer of different size smscoreapi.c: In function 'smscore_set_device_mode': smscoreapi.c:820: warning: cast from pointer to integer of different size smscoreapi.c:820: warning: cast to pointer from integer of different size ...and fix the following OOPS on 64bit kernels: [ 717.263667] usb 6-4: new high speed USB device using ehci_hcd and address 2 [ 717.396386] usb 6-4: configuration #1 chosen from 1 choice [ 717.473650] Unable to handle kernel paging request at 0000000000c02000 RIP: [ 717.473657] [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.473669] PGD 3c6f7067 PUD 3d484067 PMD 0 [ 717.473674] Oops: 0002 [1] SMP [ 717.473678] CPU 0 [Modules linked in snipped] [ 717.473773] Pid: 8380, comm: modprobe Tainted: P 2.6.24-16-generic #1 [ 717.473776] RIP: 0010:[] [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.473784] RSP: 0018:ffff81003d495ba8 EFLAGS: 00010206 [ 717.473786] RAX: ffff81003d8cd8d0 RBX: ffff81003d8cd800 RCX: ffff81003d8cd8d0 [ 717.473788] RDX: 0000000000000008 RSI: ffff81003f080070 RDI: ffff81003d8cd800 [ 717.473791] RBP: 0000000000000004 R08: ffff81003ec0104b R09: ffffffffffffffff [ 717.473793] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000c02000 [ 717.473796] R13: 00000000fffffff4 R14: ffff810000c02000 R15: ffff81003d8cd878 [ 717.473799] FS: 00007f70a680f6e0(0000) GS:ffffffff805b0000(0000) knlGS:0000000000000000 [ 717.473801] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 717.473804] CR2: 0000000000c02000 CR3: 000000003c68b000 CR4: 00000000000006e0 [ 717.473806] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 717.473809] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 717.473812] Process modprobe (pid: 8380, threadinfo ffff81003d494000, task ffff81003d2fc000) [ 717.473814] Stack: ffff81003d8cd800 ffff81003d8cd800 0000000000000000 ffff81003c6d8000 [ 717.473820] ffff81003dcac800 0000000000000008 ffffc20000787bb0 ffffffff88dba16c [ 717.473825] ffff81003dcac800 000000000000000a 0000000000000000 ffffffff88dbb2fa [ 717.473829] Call Trace: [ 717.473866] [] :sms1xxx:smscore_start_device+0x1c/0xb0 [ 717.473885] [] :sms1xxx:smsusb_probe+0x29a/0x670 [ 717.473929] [] :sms1xxx:smsusb_sendrequest+0x0/0x30 [ 717.473965] [] mutex_lock+0x9/0x20 [ 717.473998] [] :usbcore:usb_autopm_do_device+0x8e/0x130 [ 717.474040] [] :usbcore:usb_probe_interface+0xda/0x160 [ 717.474067] [] driver_probe_device+0x9c/0x1b0 [ 717.474091] [] __driver_attach+0xc9/0xd0 [ 717.474107] [] __driver_attach+0x0/0xd0 [ 717.474115] [] bus_for_each_dev+0x4d/0x80 [ 717.474156] [] bus_add_driver+0xac/0x220 [ 717.474203] [] :usbcore:usb_register_driver+0xa9/0x120 [ 717.474232] [] :sms1xxx:smsusb_register+0x1b/0x70 [ 717.474243] [] :sms1xxx:smscore_module_init+0x7c/0xb0 [ 717.474253] [] sys_init_module+0x18e/0x1a90 [ 717.474426] [] system_call+0x7e/0x83 [ 717.474490] [ 717.474491] [ 717.474492] Code: 66 41 c7 04 24 9c 02 41 c6 44 24 02 00 4c 89 e6 41 c6 44 24 [ 717.474506] RIP [] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.474513] RSP [ 717.474515] CR2: 0000000000c02000 [ 717.474521] ---[ end trace 52d9c6f207be106a ]--- Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 14a638cd3b6031c27b33560506244b9bf1913ad9 Author: Michael Krufky Date: Sat Jun 28 23:53:51 2008 -0300 V4L/DVB (8308): sms1xxx: Provide option to support Siano default usb ids Provide an option to enable / disable support for Siano's default usb ids. This allows the support for Siano's USB IDs to be disabled, so that Siano's external driver can be used, instead. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eb383bddc5ec52087ccfad4cccd8c6cc57c846d8 Author: Michael Krufky Date: Sun Jun 29 01:33:23 2008 -0300 V4L/DVB (8307): sms1xxx: change smsusb_driver.name to sms1xxx Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 5068b7a449293ced0ea963f3c944189d78fe1b1e Author: Michael Krufky Date: Sat Jun 28 23:27:19 2008 -0300 V4L/DVB (8306): sms1xxx: log firmware download process by default Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0f2a1ee112a4709a3b1a3c3c64b5d11752da1eef Author: Michael Krufky Date: Sat Jun 28 20:53:45 2008 -0300 V4L/DVB (8305): sms1xxx: fix warning: format '%d' expects type 'int', but argument x has type 'size_t' Fix the following 64bit build warning: make[2]: Entering directory `/usr/src/linux-headers-2.6.24-16-generic' CC [M] smscoreapi.o smscoreapi.c: In function 'smscore_load_firmware_from_file': smscoreapi.c:604: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' CC [M] smsusb.o smsusb.c: In function 'smsusb1_load_firmware': smsusb.c:216: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' smsusb.c:223: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8f37356b065206316e0b66dbee2718c82329684c Author: Michael Krufky Date: Sat Jun 28 17:09:28 2008 -0300 V4L/DVB (8303): sms1xxx: update MODULE_DESCRIPTION set MODULE_DESCRIPTION to "Driver for the Siano SMS1XXX USB dongle" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit cf1cfe1ba70952093a46bb0e21b58357f36f2e8f Author: Michael Krufky Date: Sat Jun 28 16:45:36 2008 -0300 V4L/DVB (8302): sms1xxx: fix Siano board names Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 02aea4fb640cdc4018e0a6d34e235eb63e4482d7 Author: Michael Krufky Date: Thu Jun 26 04:58:30 2008 -0300 V4L/DVB (8301): sms1xxx: add capability to define device-specific firmware filenames Add the capability to define device-specific firmware filenames for the SMS1150, with a mechanism to fall back to the generic firmware if the device-specific firmware is not present. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2708e888c57904f78649dcd91dcda9768d580ecf Author: Michael Krufky Date: Sat Jun 21 05:24:38 2008 -0300 V4L/DVB (8300): sms1xxx: simplify smsusb_init_device switch..case block Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0c071f374f66f05aded3be970f683d54fd918806 Author: Michael Krufky Date: Sat Jun 21 02:44:02 2008 -0300 V4L/DVB (8299): sms1xxx: mark functions static Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c65c7a652ff10b86d33eda36f9c4200027bd8dd4 Author: Michael Krufky Date: Thu Jun 19 22:20:49 2008 -0300 V4L/DVB (8298): sms1xxx: remove redundant __func__ in sms_err macro Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2522dc13245073f75399ada8e7f6acecde834953 Author: Michael Krufky Date: Thu Jun 19 22:15:38 2008 -0300 V4L/DVB (8297): sms1xxx: remove old printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eb250942fe3cf2a129ab55d65161bc66b7009853 Author: Michael Krufky Date: Thu Jun 19 22:07:23 2008 -0300 V4L/DVB (8296): sms1xxx: always show error messages Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f14d56a99bddb779f6f7ec028bcd9d142536589e Author: Michael Krufky Date: Thu Jun 19 20:59:08 2008 -0300 V4L/DVB (8295): sms1xxx: add debug module option, to enable debug messages All dmesg spam turned off by default, for now. Values for debug: (info=1, adv=2 (or-able) Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a0c0abcb1fdb316dee3a38cff9843d7d094c327c Author: Michael Krufky Date: Thu Jun 19 20:35:21 2008 -0300 V4L/DVB (8294): sms1xxx: move message formatting into printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 068d6c0f5d6c67d0e93f8e214897ddd64746be4e Author: Michael Krufky Date: Thu Jun 19 01:15:46 2008 -0300 V4L/DVB (8293): sms1xxx: create printk macros Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 1c11d546b6c31399ac60f42d3103227cc1164d80 Author: Michael Krufky Date: Wed Jun 18 22:09:55 2008 -0300 V4L/DVB (8292): sms1xxx: add code to allow device-specific functionality Set board ID in the usb_device_id table's driver_info field. Use board name when registering the dvb adapter. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit dd5b2a5c2a6c793d855910864593ad26dd844154 Author: Michael Krufky Date: Wed Jun 18 20:25:25 2008 -0300 V4L/DVB (8291): sms1xxx: change default_mode to 4 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d3e72fe75ef7651e49e50f6a5f2c1c6453749e33 Author: Michael Krufky Date: Mon Jun 16 12:37:05 2008 -0300 V4L/DVB (8290): sms1xxx: small cleanup Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit df0462e77e9aa19d50dbfd540e78f1803e992c25 Author: Michael Krufky Date: Sun Jun 15 19:39:55 2008 -0300 V4L/DVB (8289): sms1xxx: remove #if LINUX_VERSION_CODE checks Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fbd05c8213e7cddca3041c280e5fca5eff0956f9 Author: Michael Krufky Date: Sun Jun 15 19:27:35 2008 -0300 V4L/DVB (8288): sms1xxx: more cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e080842c6c31249010adb184f9efbbc5cb40bd2b Author: Michael Krufky Date: Sun Jun 15 19:11:37 2008 -0300 V4L/DVB (8287): sms1xxx: fix WARNING: unnecessary cast may hide bugs fix the following checkpatch.pl warning: WARNING: unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html 596: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:540: + msg = (struct SmsMsgHdr_ST *) kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA); Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 18245e18eeae15e928b46c1ae0f3a19bdc50419d Author: Michael Krufky Date: Sun Jun 15 17:52:24 2008 -0300 V4L/DVB (8286): sms1xxx: remove typedefs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ca78373687bddcd436e1bf2d9b6806cfd9cad8b8 Author: Michael Krufky Date: Sun Jun 15 17:36:00 2008 -0300 V4L/DVB (8285): sms1xxx: more 80-column cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9f2113975a7898c913c668bb709e95c27e51617b Author: Michael Krufky Date: Sun Jun 15 17:26:42 2008 -0300 V4L/DVB (8284): sms1xxx: fix WARNING: printk() should include KERN_ facility level Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 59bf6b8e85209f4b875e319b42e8f13af7797826 Author: Michael Krufky Date: Sun Jun 15 16:50:11 2008 -0300 V4L/DVB (8283): sms1xxx: 80-column cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fa830e8a014a206103d06a7600ed8c661b427db3 Author: Michael Krufky Date: Sun Jun 15 15:52:43 2008 -0300 V4L/DVB (8282): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f0333e3de0e06fb9a6662a6df7d3d1cc8e5dbeca Author: Michael Krufky Date: Sun Jun 15 15:32:00 2008 -0300 V4L/DVB (8281): sms1xxx: remove INT / UINT typedefs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 822374165d6b11733467cfa2fa18234319198233 Author: Michael Krufky Date: Sun Jun 15 15:14:13 2008 -0300 V4L/DVB (8280): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 73104fb3e4e692cb1f9505b548ab073b0859b256 Author: Michael Krufky Date: Sat Jun 14 18:27:18 2008 -0300 V4L/DVB (8279): sms1xxx: #define usb vid:pid's Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 494d24c527e5ab43aecb8e77bfdc7e939466b134 Author: Michael Krufky Date: Sat Jun 14 07:40:41 2008 -0300 V4L/DVB (8278): sms1xxx: more codingstyle cleanups Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f17407a85db3b86526d54e65698348873a6df617 Author: Michael Krufky Date: Sat Jun 14 00:43:26 2008 -0300 V4L/DVB (8277): sms1xxx: update latest siano drop to 1.2.17 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 55ad310c2f21281f50fa040b7765a4a1151bd420 Author: Michael Krufky Date: Tue May 6 03:52:44 2008 -0300 V4L/DVB (8276): sms1xxx: codingstyle cleanup: "(foo*)" should be "(foo *)" ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a83ccdd6a952eb25d3f51dfdc175c1e9bf8f7cae Author: Michael Krufky Date: Tue May 6 03:11:51 2008 -0300 V4L/DVB (8275): sms1xxx: codingstyle cleanup: "foo* bar"/"foo * bar" should be "foo *bar" ERROR: "foo* bar" should be "foo *bar" ERROR: "foo * bar" should be "foo *bar" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3617691fb98b81850640a9b61fb932b798ad4504 Author: Michael Krufky Date: Thu May 22 18:32:40 2008 -0300 V4L/DVB (8274): sms1xxx: build cleanup after driver relocation Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 18658117ff844e8117f6b363cb7fa8c5f8ad2cb8 Author: Michael Krufky Date: Thu May 22 18:30:17 2008 -0300 V4L/DVB (8273): sms1xxx: replace __FUNCTION__ with __func__ Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 854470606070d91955f03a7dca3a8024fc2a2540 Author: Michael Krufky Date: Thu May 22 18:29:20 2008 -0300 V4L/DVB (8272): sms1xxx: move driver from media/mdtv/ to media/dvb/siano/ Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7d18d2e91b5495ed0b99c83d595a56e25521a111 Author: Steven Toth Date: Thu May 22 18:07:39 2008 -0300 V4L/DVB (8271): sms1xxx: usbvid table Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 19d703da05de6495adfc0ec9aec927d2fce99af6 Author: Steven Toth Date: Thu May 22 18:06:41 2008 -0300 V4L/DVB (8270): sms1xxx: header include cleanups and unexport symbols Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8d4f9d0e0bb8b8191b525bd41eddadaf831e47ef Author: Steven Toth Date: Thu May 22 18:05:26 2008 -0300 V4L/DVB (8269): sms1xxx: copyrights Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit eae55660fc4a7f17f0f87458d8ada2b51b1833c1 Author: Steven Toth Date: Thu May 22 18:04:36 2008 -0300 V4L/DVB (8268): sms1xxx: usb cleanup Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 159ed4bbc394bb3e547eb64fdd3a59141ced131a Author: Steven Toth Date: Thu May 22 18:01:42 2008 -0300 V4L/DVB (8267): sms1xxx: Makefile cleanup Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 3dd243787017e40c66ae54cf590ea513a110c51d Author: Steven Toth Date: Thu May 22 18:01:02 2008 -0300 V4L/DVB (8266): sms1xxx: merge modules Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7a19598c75660b6d4464d291f8e99a91fd7afc4a Author: Steven Toth Date: Thu May 22 16:43:04 2008 -0300 V4L/DVB (8265): sms1xxx: Kconfig / Makefile cleanups Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9e4fb5e7122ce67769719e715159baed5e5d7247 Author: Steven Toth Date: Thu May 22 15:48:54 2008 -0300 V4L/DVB (8264): sms1xxx: remove smstypes.h Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 955e9ca3cdeae62e8067ede204b5a02dcde6813e Author: Steven Toth Date: Thu May 22 15:46:32 2008 -0300 V4L/DVB (8263): sms1xxx: merge ksyms Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c6465799c38762b963bb819e033d2a56a3d3c233 Author: Steven Toth Date: Mon May 19 19:09:21 2008 -0300 V4L/DVB (8262): sms1xxx: remove smschar.o Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 464a77dd8845fc8f3beeaad24478081576c4b83a Author: Steven Toth Date: Mon May 19 19:01:25 2008 -0300 V4L/DVB (8261): sms1xxx: remove smsnet.o Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7315b082e333191f7606dbb23dbcbdba98a79c11 Author: Michael Krufky Date: Mon May 19 18:58:40 2008 -0300 V4L/DVB (8260): sms1xxx: build fixes Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9c59f968a9960bbb3402c8a8ea8004c798f4f383 Author: Michael Krufky Date: Mon May 19 18:57:12 2008 -0300 V4L/DVB (8259): sms1xxx: pass adapter_nr into dvb_register_adapter Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2e5c1ec8865abd81e24a394918c7ba315e0b7b70 Author: Michael Krufky Date: Mon May 19 18:56:13 2008 -0300 V4L/DVB (8258): add support for SMS1010 and SMS1150 based digital television devices initial driver drop, provided by Siano Mobile Silicon, Inc. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a9e285856112e5e721b6a341d15437a164128b30 Author: Laurent Pinchart Date: Fri Jul 11 19:32:15 2008 -0300 V4L/DVB (8257): uvcvideo: Fix possible AB-BA deadlock with videodev_lock and open_mutex The uvcvideo driver's uvc_v4l2_open() method is called from videodev's video_open() function, which means it is called with the videodev_lock mutex held. uvc_v4l2_open() then takes uvc_driver.open_mutex to check dev->state and avoid racing against a device disconnect, which means that open_mutex must nest inside videodev_lock. However uvc_disconnect() takes the open_mutex around setting dev->state and also around putting its device reference. However, if uvc_disconnect() ends up dropping the last reference, it will call uvc_delete(), which calls into the videodev code to unregister its device, and this will end up taking videodev_lock. This opens a (unlikely in practice) window for an AB-BA deadlock and also causes a lockdep warning because of the lock misordering. Fortunately there is no apparent reason to hold open_mutex when doing kref_put() in uvc_disconnect(): if uvc_v4l2_open() runs before the state is set to UVC_DEV_DISCONNECTED, then it will take another reference to the device and kref_put() won't call uvc_delete; if uvc_v4l2_open() runs after the state is set, it will run before uvc_delete(), see the state, and return immediately -- uvc_delete() does uvc_unregister_video() (and hence video_unregister_device(), which is synchronized with videodev_lock) as its first thing, so there is no risk of use-after-free in uvc_v4l2_open(). Bug diagnosed based on a lockdep warning reported by Romano Giannetti . Signed-off-by: Roland Dreier Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 6f80e1b4cda7e184e369c84a8b388882b0233d53 Author: Andrew Morton Date: Fri Jul 4 06:33:23 2008 -0300 V4L/DVB (8256): uvc/uvc_v4l2.c: suppress uninitialized var warning drivers/media/video/uvc/uvc_v4l2.c: In function `uvc_v4l2_mmap': drivers/media/video/uvc/uvc_v4l2.c:1035: warning: 'buffer' might be used uninitialized in this function Signed-off-by: Andrew Morton Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 25e69850d1bb315f251c91183b89da44d4f9be23 Author: Laurent Pinchart Date: Wed Jul 9 18:29:59 2008 -0300 V4L/DVB (8254): uvcvideo : Add support for Asus F9GS integrated webcam Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit a9e1113483f110723e4c0277a05d08f51da232aa Author: Mauro Carvalho Chehab Date: Wed Jul 9 05:26:26 2008 -0300 V4L/DVB (8253): gspca: fix warnings on x86_64 /home/v4l/master/v4l/gspca.c: In function 'gspca_frame_add': /home/v4l/master/v4l/gspca.c:222: warning: format '%d' expects type 'int', but argument 2 has type 'long int' /home/v4l/master/v4l/gspca.c: In function 'dev_read': /home/v4l/master/v4l/gspca.c:1568: warning: format '%d' expects type 'int', but argument 2 has type 'size_t' /home/v4l/master/v4l/gspca.c:1618: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a47cacbd869b67ce16981ad5a0b06e4eac2efaff Author: Christophe Jaillet Date: Fri Jul 4 06:33:22 2008 -0300 V4L/DVB (8252): buf-dma-sg.c: avoid clearing memory twice 1) Remove a useless initialisation of 'i' 2) Avoid clearing the memory allocated twice (once in 'kcalloc', once in 'sg_init_table') 3) Remove a test that can never trigger. The function returns NULL in such a case, so we know that at this point 'pages[0]' != NULL Signed-off-by: Christophe Jaillet Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit a8a89b7f60f18c2517c3b950f5ecede0626363eb Author: Akinobu Mita Date: Fri Jul 4 06:33:20 2008 -0300 V4L/DVB (8251): ttusb: use simple_read_from_buffer()() Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 3fce3fb0592841857ae01334d0c6934c1ad32faf Author: David Howells Date: Tue Jul 8 16:04:38 2008 -0300 V4L/DVB (8249): Fix pointer cast warnings in the ivtv framebuffer driver Fix casts of pointers to integers of different sizes in the ivtv framebuffer driver. These were introduced in patch 38eb6ba5b8487d15b020fe391d324edd2b659b03. Signed-off-by: David Howells Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5a367dfb739831d54caf226ce0bc4c75ef264d8d Author: Jean Delvare Date: Thu Jul 10 11:23:37 2008 -0300 V4L/DVB (8246): tvaudio: Stop I2C driver ID abuse The tvaudio driver is using "official" I2C device IDs for internal purpose. There must be some historical reason behind this but anyway, it shouldn't do that. As the stored values are never used, the easiest way to fix the problem is simply to remove them altogether. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit be99af6679174e5d0e9f36fc8c18318a8ce34bca Author: Jean Delvare Date: Thu Jul 10 11:04:10 2008 -0300 V4L/DVB (8245): ovcamchip: Delete stray I2C bus ID I2C_HW_SMBUS_OVFX2 is referenced in ovcamchip_core.c, but no bus uses this driver ID, so we can remove the reference. As far as I can see, the Cypress FX2 webcam is handled by a different driver (dvb-usb). Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit e2fc00c21124d9d9a8d4f396e5498ea27ddfc8fd Author: Massimo Piccioni Date: Fri Jul 11 13:48:02 2008 -0300 V4L/DVB (8244): saa7134: add support for AVerMedia M103 The following patch updates saa7134 driver to add support for AVerMedia M103 MiniPCI DVB-T Hybrid card. Signed-off-by: Massimo Piccioni [mchehab@infradead.org: fixed merge conflicts and a small codingstyle] Signed-off-by: Mauro Carvalho Chehab commit 52b5045078b76ee86e210210601d45670eab22f1 Author: Michael Krufky Date: Wed Jul 9 02:18:49 2008 -0300 V4L/DVB (8236): cx23885: add support for new revision of FusionHDTV7 Dual Express The new revision of this board uses the same pci subsystem id as the first revision, but uses a S5H1411 demodulator instead of the S5H1409. In the case of the FusionHDTV7 Dual Express, if s5h1409_attach fails, try s5h1411_attach. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bdf2fe4a0b9d23e69c77eaec76212216c9a957ef Author: Laurent Pinchart Date: Mon Jul 7 23:41:40 2008 -0300 V4L/DVB (8235): uvcvideo : Add support for Medion Akoya Mini E1210 integrated webcam Signed-off-by: Tim Gardner Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 6833c917b4de1757febdbf946d709ece6dc7a86f Author: Laurent Pinchart Date: Mon Jul 7 23:04:29 2008 -0300 V4L/DVB (8234): uvcvideo: Make input device support optional UVC devices can report button events. The uvcvideo driver depends on CONFIG_INPUT to report events to the input layer. This patch removes the hard dependency by introducing a new CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV option. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit ac0d6df69bc72eabda944fd14a958074dc08ca0c Author: Jean-Francois Moine Date: Tue Jul 8 06:58:15 2008 -0300 V4L/DVB (8232): gspca: Change the USERPTR mechanism. main: Change the packet copy mechanism for userptr. Cannot do reqbufs ioctl when already done and count != 0. Accept count < frame size in read(). Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit c41492c89a00630c7482eae25deaf9af91b73c98 Author: Jean-Francois Moine Date: Mon Jul 7 08:31:16 2008 -0300 V4L/DVB (8231): gspca: Do not declare the webcams declared by other drivers. etoms: Do not declare the webcams declared by the driver et61x251. sonixb, sonixj: Do not declare the webcams declared by the driver sn9c102. zc3xx: Do not declare the webcams declared by the driver zc0301. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit f87086e302300fdff1bd32049deb7a7f3e3de7da Author: Hans Verkuil Date: Fri Jul 18 00:50:58 2008 -0300 v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10 Also remove some blank lines that were used to split compat code at -devel tree. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e01117c81676dc9897f567e32cdc13a26e85280b Author: Laurent Pinchart Date: Fri Jul 4 00:36:21 2008 -0300 V4L/DVB (82