commit 39b945a37bac2b692773a470890c8ba301485b15 Merge: 203c801... 0ef2cfc... Author: Linus Torvalds Date: Thu Jun 5 16:15:00 2008 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa: fix tosa.c build error [ARM] 5067/1: _raw_write_can_lock macro bugfix [ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration [ARM] 5068/1: PXA2xx Additional gpio definitions [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP [ARM] 5060/1: remove unnecessary include of asm/io.h [ARM] fix AT91 include loops commit 203c80187eba037f2d6562e0d5847014746726dd Author: Ben Collins Date: Thu Jun 5 19:10:21 2008 -0400 mmc: Fix crash in mmc_block on 64-bit Fairly simple. "dev_use" was being allocated as a zero length array because of bad math on 64-bit systems, causing a crash in find_first_zero_bit(). One-liner follows: Signed-off-by: Ben Collins Acked-by: Pierre Ossman Signed-off-by: Linus Torvalds commit b2ab26ab28cfed076ee8a83627d008472f6ac54f Merge: 5965087... be573e7... Author: Linus Torvalds Date: Thu Jun 5 14:30:47 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: (48 commits) V4L/DVB (8001): dib0070: fix dib0070_attach when !CONFIG_DVB_TUNER_DIB0070 V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain V4L/DVB (7990): Fix entry for PowerColor RA 330 and make it run with firmware version 2.7 V4L/DVB (7983): tda18271_calc_rf_cal must return the return value of tda18271_lookup_map V4L/DVB (7978): cx18: explicitly test for XC2028 tuner V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use. V4L/DVB (7975): saa7134_empress V4L/DVB (7974): fix MEDIA_TUNER && FW_LOADER build error V4L/DVB (7972): or51132.c: unaligned V4L/DVB (7971): usb: unaligned V4L/DVB (7970): mix trivial endianness annotations V4L/DVB (7969): m920x: unaligned access V4L/DVB (7968): zoran: endianness annotations V4L/DVB (7967): bt8xx: unaligned access V4L/DVB (7966): cx18: direct dereferencing of iomem V4L/DVB (7965): annotate bcx_riscmem V4L/DVB (7964): cx18 iomem annotations V4L/DVB (7963): ivtv: trivial annotations V4L/DVB (7962): ttusb endianness annotations and fixes V4L/DVB (7961): fix endianness bug in dib0700_devices.c ... commit 5965087dc96167298ab83598f681d4d6f9d324fa Merge: 698f7a4... cd9da13... Author: Linus Torvalds Date: Thu Jun 5 14:29:53 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: Fix divide by zero error in build_clear_page() and build_copy_page() [MIPS] Fix typo in header guard [MIPS] Fix build error - Delete debugging crap that crept in with CMP [MIPS] Add accessors for random register. [MIPS] IP27: misc fixes [MIPS] IP27: Fix clockevent setup [MIPS] IP27: Fix bootmem memory setup [MIPS] remove CONFIG_CPU_R4000 line from Makefile [MIPS] Fix check for valid stack pointer during backtrace [MIPS] Add missing braces to pte_mkyoung [MIPS] R4700: Fix build_tlb_probe_entry [MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids. [MIPS] Alchemy: export get_au1x00_speed for modules commit 698f7a4a12c15fef354b2a1ac14f90a0e71008d9 Merge: adbd588... ba75321... Author: Linus Torvalds Date: Thu Jun 5 14:25:48 2008 -0700 Merge git://git.infradead.org/~dwmw2/mtd-2.6.26 * git://git.infradead.org/~dwmw2/mtd-2.6.26: [MTD] [MAPS] Fix cmdlineparse handling in mapping files [MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path commit adbd5886da5f467148b26cca3728ab0e672b3fcc Author: Willy Tarreau Date: Tue Jun 3 00:20:28 2008 +0200 doc: add suggestions about good practises for maintainers Suggest how to deal with patch modifications caused by merging or back-porting when you're a maintainer. Signed-off-by: Willy Tarreau Signed-off-by: Linus Torvalds commit ddb2c43594f22843e9f3153da151deaba1a834c5 Author: Chris Wright Date: Wed Jun 4 09:16:33 2008 -0700 asn1: additional sanity checking during BER decoding - Don't trust a length which is greater than the working buffer. An invalid length could cause overflow when calculating buffer size for decoding oid. - An oid length of zero is invalid and allows for an off-by-one error when decoding oid because the first subid actually encodes first 2 subids. - A primitive encoding may not have an indefinite length. Thanks to Wei Wang from McAfee for report. Cc: Steven French Cc: stable@kernel.org Acked-by: Patrick McHardy Signed-off-by: Chris Wright Signed-off-by: Linus Torvalds commit efedf51c866130945b5db755cb58670e60205d83 Author: Nick Piggin Date: Wed Jun 4 17:18:42 2008 +0200 Add 'rd' alias to new brd ramdisk driver Alias brd to rd in the hope of helping legacy users. Suggested by Jan. Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 16104b5504fa8be130f7f127a5a1c7dd774efc44 Author: Stefan Richter Date: Thu Jun 5 22:47:13 2008 +0200 x86: fix CONFIG_NONPROMISC_DEVMEM prompt and help text Here is an attempt to translate the prompt and help text into something which is legible and, as a bonus, correct. Signed-off-by: Stefan Richter Signed-off-by: Linus Torvalds commit 609a70ac927b72da647ccee7873d928d45055eae Author: David Howells Date: Thu Jun 5 17:07:35 2008 +0100 FRV: ip_fast_csum() requires a memory clobber on its inline asm ip_fast_csum() requires a memory clobber on its inline asm as it accesses memory in a fashion that gcc can't predict. The GCC manual says: If your assembler instructions access memory in an unpredictable fashion, add `memory' to the list of clobbered registers. This will cause GCC to not keep memory values cached in registers across the assembler instruction and not optimize stores or loads to that memory. The bug hasn't been noticed in FRV, but it has been seen in PA-RISC. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 5a515bcbea580a65ced92405b083299df9003748 Author: Bjorn Helgaas Date: Thu Jun 5 10:32:23 2008 -0600 PNP: skip UNSET MEM resources as well as DISABLED ones We don't need to reserve "unset" resources. Trying to reserve them results in messages like this, which are ugly but harmless: system 00:08: iomem range 0x0-0x0 could not be reserved Future PNP patches will remove use of IORESOURCE_UNSET, but we still need it for now. Signed-off-by: Bjorn Helgaas Signed-off-by: Linus Torvalds commit cd9da13d6ef4f4b652a9a885d4a7c80e40fed229 Author: Yoichi Yuasa Date: Wed May 7 23:38:15 2008 +0900 Fix divide by zero error in build_clear_page() and build_copy_page() Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 2cc3c0b67bdde7263f6eb16c16709e0b84047646 Author: Vegard Nossum Date: Tue May 27 17:27:28 2008 +0200 [MIPS] Fix typo in header guard Signed-off-by: Vegard Nossum Signed-off-by: Ralf Baechle commit 482845a348f76fbf9cec6dda0f1eb113d4fafd9d Author: Ralf Baechle Date: Mon May 26 09:47:55 2008 +0100 [MIPS] Fix build error - Delete debugging crap that crept in with CMP Signed-off-by: Ralf Baechle commit 272bace7f3753ea8bf6ee80e3a6b32fa64190744 Author: Ralf Baechle Date: Mon May 26 09:35:47 2008 +0100 [MIPS] Add accessors for random register. Signed-off-by: Ralf Baechle commit 96173a6c4ebca4c146bb87026cce78bbe392cb61 Author: Thomas Bogendoerfer Date: Thu Apr 17 22:07:42 2008 +0200 [MIPS] IP27: misc fixes - fix PCI interrupt assignment by emulating ioc3 interrupt pin register - use pci_probe_only mode - select correct page size in bridge - remove no longer needed ioc3_sio_init() code [Ralf: Fix for 64kB or larger pagesizes] Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit b32bb803fb52cc669762780d44b4c3d9e3d799f6 Author: Thomas Bogendoerfer Date: Tue Apr 8 23:43:57 2008 +0200 [MIPS] IP27: Fix clockevent setup Fix breakage introduced by converting hub_rt to clockevent. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 2bf8ec2d8137e66998435ddf6d4060a558e2f727 Author: Thomas Bogendoerfer Date: Tue Apr 8 23:43:46 2008 +0200 [MIPS] IP27: Fix bootmem memory setup Changes in the generic bootmem code broke memory setup for IP27. This patch fixes this by replacing lots of special IP27 code with generic bootmon code. This has been tested only on a single node. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit c2719d93836b0b0cdf1725449d87705da6ede9a5 Author: Adrian Bunk Date: Wed May 21 01:55:02 2008 +0300 [MIPS] remove CONFIG_CPU_R4000 line from Makefile The existing options are named CONFIG_CPU_R4300 and CONFIG_CPU_R4X00, and they are directly below. Reported-by: Robert P. J. Day Signed-off-by: Adrian Bunk Signed-off-by: Ralf Baechle commit 10220c884444a1866bb070e207d84fc18188e2a7 Author: Thomas Bogendoerfer Date: Mon May 12 17:58:48 2008 +0200 [MIPS] Fix check for valid stack pointer during backtrace The newly added check for valid stack pointer address breaks at least for 64bit kernels. Use __get_user() for accessing stack content to avoid crashes, when doing the backtrace. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit 057229f9efc7ebebd3ce0496195ed46df631f383 Author: Ilpo Järvinen Date: Fri May 2 14:08:20 2008 +0300 [MIPS] Add missing braces to pte_mkyoung Only the version pte_mkyoung for 36-bit pagetables on 32-bit hw was affected and with this bug being around since November 29, 2004 there is evidence to suport the assumption it was benign ;-) Signed-off-by: Ilpo Järvinen Signed-off-by: Ralf Baechle commit 326e2e1a59decc81bea052e8a8c6d75c63daa2db Author: Thomas Bogendoerfer Date: Mon May 12 13:55:42 2008 +0200 [MIPS] R4700: Fix build_tlb_probe_entry Treat R4700 like R4600 in build_tlb_probe_entry. Without this fix kernel will lock up. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit ccdb0034f8d5321be42c479dd7fc872ba2a46adb Author: Manuel Lauss Date: Wed May 7 13:45:23 2008 +0200 [MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids. Add API to delete custom DDMA device ids create with au1xxx_ddma_device_add(). Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit b1fb05cdb9096e3fe1af4474e108dedce2515801 Author: Manuel Lauss Date: Wed May 7 13:42:55 2008 +0200 [MIPS] Alchemy: export get_au1x00_speed for modules au1xmmc.c driver depends on it, so export it for modules. Signed-off-by: Manuel Lauss Signed-off-by: Ralf Baechle commit 6311c90a9ea16b4ab93ed48f1a9022647f6b3c43 Author: Hugh Dickins Date: Thu Jun 5 14:44:39 2008 +0100 libata: fix G5 SATA broken on -rc5 Fix G5 SATA irq 18: nobody cared, reported on -rc5 by Olaf Hering: fixlet to a57c1bade5a0ee5cd8b74502db9cbebb7f5780b2 libata-sff: Fix oops reported in kerneloops.org for pnp devices with no ctl Signed-off-by: Hugh Dickins Acked-by: Alan Cox Tested-by: Olaf Hering Signed-off-by: Linus Torvalds commit be573e7872432918e1017cf1e917e73817dcdad6 Author: Michael Krufky Date: Thu Jun 5 13:08:29 2008 -0300 V4L/DVB (8001): dib0070: fix dib0070_attach when !CONFIG_DVB_TUNER_DIB0070 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 67642a0a58143761d7415f0587e0ac6dd6371251 Author: Sigmund Augdal Date: Thu Jun 5 12:53:08 2008 -0300 V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain Check that tda827x_config is defined before attempting to use it. Signed-off-by: Sigmund Augdal Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a9606ce697ed719071fcccee8591ff033fa5e16d Author: Daniel Gimpelevich Date: Tue Jun 3 21:29:45 2008 -0300 V4L/DVB (7990): Fix entry for PowerColor RA 330 and make it run with firmware version 2.7 Signed-off-by: Daniel Gimpelevich Signed-off-by: Mauro Carvalho Chehab commit fc60d6e2727157b53d49c8d55888d0a78dafbc9f Author: Michael Krufky Date: Sat May 31 18:18:55 2008 -0300 V4L/DVB (7983): tda18271_calc_rf_cal must return the return value of tda18271_lookup_map On the TDA18271HD/C1, we perform RF tracking filter correction for VHF low band, only. If supplied a frequency out of range, the error must be returned to the caller (tda18271c1_rf_tracking_filter_calibration) so that it can decide whether or not to write to register EB14, RFC_CPROG[7:0] Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4ecc24737700f07d6c2a8fdf8c1737e399f1830f Author: Hans Verkuil Date: Fri May 30 11:03:12 2008 -0300 V4L/DVB (7978): cx18: explicitly test for XC2028 tuner Testing whether xceive_pin is non-zero is not good enough as 0 is a valid value. Instead explicitly test whether the Xceive tuner is used. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5e7fdc5ed820516f8253cc7daad27cf3ee6bd784 Author: Hans Verkuil Date: Fri May 30 10:51:53 2008 -0300 V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 388748e61cc59487c34e1dfa890ffc44e4d16b1f Author: Dmitri Belimov Date: Wed May 21 01:20:34 2008 -0300 V4L/DVB (7975): saa7134_empress This is patch for fix data structure in querycap syscall. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 6637dea60ec93916ea0623a0e9bcc2b1769cbc11 Author: Ingo Molnar Date: Tue May 20 19:34:09 2008 -0300 V4L/DVB (7974): fix MEDIA_TUNER && FW_LOADER build error -tip testing found the following build failure: LD .tmp_vmlinux1 drivers/built-in.o: In function `generic_set_freq': tuner-xc2028.c:(.text+0xbd896): undefined reference to `request_firmware' tuner-xc2028.c:(.text+0xbdd7a): undefined reference to `release_firmware' drivers/built-in.o: In function `xc_load_fw_and_init_tuner': xc5000.c:(.text+0xc68e6): undefined reference to `request_firmware' xc5000.c:(.text+0xc6abe): undefined reference to `release_firmware' with this config: http://redhat.com/~mingo/misc/config-Tue_May_20_18_11_34_CEST_2008.bad the reason is another kconfig tool bug that has to be worked around in the driver's Kconfig file: if FW_LOADER is selected in a second dependency, that is not properly propagated up the dependencies. in this case, FW_LOADER is selected from MEDIA_TUNER_XC2028: config MEDIA_TUNER_XC2028 tristate "XCeive xc2028/xc3028 tuners" depends on VIDEO_MEDIA && I2C depends on HOTPLUG select FW_LOADER which got selected by MEDIA_TUNER: config MEDIA_TUNER tristate default VIDEO_MEDIA && I2C depends on VIDEO_MEDIA && I2C select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG but the kconfig tool did not pick up this second-order dependency and allowed CONFIG_FW_LOADER=m to be selected - in which case the build fails. the workaround i found was to move the select of FW_LOADER one level up, so that the buggy kconfig tool can notice it and can act appropriately. This problem can probably be worked around in other ways as well, i went for the minimal fix. Obviously, the kconfig tool should be fixed, it is not reasonable to expect driver authors to do manual dependency resolution (that kconfig itself already does) and uglify the Kconfig files. The kconfig tool did nothing to warn about this situation and did not prevent this faulty .config from being constructed. Signed-off-by: Ingo Molnar Signed-off-by: Mauro Carvalho Chehab commit 18dcd55a8bf8aa7009c647725b5234c9589c6985 Author: Al Viro Date: Wed May 21 00:33:11 2008 -0300 V4L/DVB (7972): or51132.c: unaligned Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 637007fe5cfc790c46e3d7af8ba069ddd73f389c Author: Al Viro Date: Wed May 21 00:33:01 2008 -0300 V4L/DVB (7971): usb: unaligned Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit a954b6681dd389e6bb63d9b5f3254d675f6984c9 Author: Al Viro Date: Wed May 21 00:32:51 2008 -0300 V4L/DVB (7970): mix trivial endianness annotations Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit fa9c13a383ea60b5e0a89e9e180683411bc5552c Author: Al Viro Date: Wed May 21 00:32:41 2008 -0300 V4L/DVB (7969): m920x: unaligned access Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 581a7f1a2ddedbc27ad76f518b861ce1e60ff5ab Author: Al Viro Date: Wed May 21 00:32:31 2008 -0300 V4L/DVB (7968): zoran: endianness annotations Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit c1c36f3128c89aa96f01cbf6d40b0cd77a8bc45e Author: Al Viro Date: Wed May 21 00:32:21 2008 -0300 V4L/DVB (7967): bt8xx: unaligned access Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 576904bb8941d2ae958a097888cee418d5192144 Author: Al Viro Date: Wed May 21 00:32:11 2008 -0300 V4L/DVB (7966): cx18: direct dereferencing of iomem Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit d8eaa58b06e8779453410d88d2d86e700a0432c6 Author: Al Viro Date: Wed May 21 00:31:51 2008 -0300 V4L/DVB (7965): annotate bcx_riscmem Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 990c81c8afcd71eced2482ad59950ea755eddc7f Author: Al Viro Date: Wed May 21 00:32:01 2008 -0300 V4L/DVB (7964): cx18 iomem annotations Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit b0510f8dc73dce56f35337487c6374ae84b15446 Author: Al Viro Date: Wed May 21 00:31:41 2008 -0300 V4L/DVB (7963): ivtv: trivial annotations Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit d4f979a9e1c5c8ed291e89ec38248823c9a182ba Author: Al Viro Date: Wed May 21 00:31:31 2008 -0300 V4L/DVB (7962): ttusb endianness annotations and fixes Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit da5ee48677b96dbf44c2ae46857dea060af34164 Author: Al Viro Date: Wed May 21 00:31:21 2008 -0300 V4L/DVB (7961): fix endianness bug in dib0700_devices.c Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 12fbcef1055ee7dd522d578c4c6c0e80acaa3d4c Author: Al Viro Date: Wed May 21 00:31:11 2008 -0300 V4L/DVB (7960): net: endianness annotations Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit b05ce2e79ebaf205b2d66ac32f10e2bd231d80a4 Author: Al Viro Date: Wed May 21 00:31:01 2008 -0300 V4L/DVB (7959): endianness fix in flexcop-usb.c Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 3e085629bc921c37c1bb2e2fb6227fa14de14682 Author: Al Viro Date: Wed May 21 00:30:51 2008 -0300 V4L/DVB (7958): fix unaligned access in av7110.c Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit a230e55d92347e09d9ba2e97096df114b2dfaf2d Author: Al Viro Date: Wed May 21 00:30:41 2008 -0300 V4L/DVB (7957): fix the roothole in av7110_av.c direct dereferencing from user-supplied address Signed-off-by: Al Viro Reviewed-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit f34ec12a17984d7df784bf49caf64f5f743e5e10 Author: Al Viro Date: Wed May 21 00:30:31 2008 -0300 V4L/DVB (7956): cinergyT2: endianness annotations, endianness and race fixes Endianness annotations and fixes + fixing the handling of ->uncorrected_block_count Signed-off-by: Al Viro Signed-off-by: Mauro Carvalho Chehab commit 39028ec69b13712ec1dcd9aa14844bf60f19cb20 Author: David Woodhouse Date: Mon Jun 2 15:46:51 2008 -0300 V4L/DVB (7166): [v4l] Add new user class controls and deprecate others These were removed in commit 26d507fcfef7f7d0cd2eec874a87169cc121c835: > -#define V4L2_CID_HCENTER (V4L2_CID_BASE+22) > -#define V4L2_CID_VCENTER (V4L2_CID_BASE+23) > -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+24) /* > last CID + 1 */ > + > +/* Deprecated, use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */ > +#define V4L2_CID_HCENTER_DEPRECATED (V4L2_CID_BASE+22) > +#define V4L2_CID_VCENTER_DEPRECATED (V4L2_CID_BASE+23) But there was no warning in Documentation/feature-removal-schedule.txt and I'm receiving reports that it's breaking userspace apps (the gstreamer-v4l2 plugin breaks in Fedora rawhide). You can't just pull things from the published userspace API like that. Please can we revert the addition of _DEPRECATED to these ioctl definitions. Perhaps we can add a runtime warning if they actually get used? Or a compile-time warning if we can manage that? Signed-off-by: David Woodhouse Signed-off-by: Mauro Carvalho Chehab commit c663d03590a882f4834197bff278ca0aa2a95e2e Author: Michael Krufky Date: Fri Apr 18 21:22:50 2008 -0300 V4L/DVB (7944): tuner-xc2028: use hybrid_tuner_request_state Use a standard method to manage multiple instances of a hybrid tuner. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9adea1c00df74823e1719ebbcb86c972c4c2aba1 Author: Michael Krufky Date: Fri Apr 18 20:26:04 2008 -0300 V4L/DVB (7943): tuner: add macro, hybrid_tuner_report_instance_count Create a macro to report the number of instances of the tuner driver currently in use. This will allow drivers to perform specific cleanups before destroying the last instance of a tuner. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit ba60bc673ce7d019ae6684cebbb33e5239346664 Author: Hans Verkuil Date: Sun May 25 14:34:36 2008 -0300 V4L/DVB (7934): cx18: move gpio_dir/val statics to the cx18 struct. The gpio_dir/val statics cannot be global, they are card-specific. Thanks to Andy Walls for pointing this out. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8f9935732930e705cab1936a03418ce01aee979a Author: Hans Verkuil Date: Sun May 25 11:45:53 2008 -0300 V4L/DVB (7932): cx18: mark Compro H900 as fully supported. I always assumed that the Compro H900 could do digital as well, but it turned out that it is an analog-only card. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 31554ae599a8ff6854bf8ecbedc1946c64854388 Author: Hans Verkuil Date: Sun May 25 11:21:27 2008 -0300 V4L/DVB (7931): cx18: allow for simultaneous digital and analog capture The HVR-1600 can do both analog and digital capture at the same time. Due to a driver bug -EBUSY would be returned when attempting to setup an analog capture while a digital capture was already in progress. Separate the two internally. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit be303e16dbd210077c697aaf2f0960413166b53d Author: Hans Verkuil Date: Sat May 24 12:43:43 2008 -0300 V4L/DVB (7930): ivtv: bump version to 1.3.0. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 63b8c709895febf62766dc8e818a1457a520fb15 Author: Hans Verkuil Date: Wed May 21 17:40:19 2008 -0300 V4L/DVB (7928): cx18: fix audio registers 808 and 80c The handling of the audio registers 808 and 80c were based on old datasheets. Updated to the latest information. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7f3917f6484938d56cb5ab660f476c1dfa445a81 Author: Hans Verkuil Date: Mon May 19 22:13:02 2008 -0300 V4L/DVB (7925): cx18: ensure that the xceive pin is always asserted on init. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3b4a9714f43a1d675a4352260a12daae197f37c3 Author: Andy Walls Date: Mon May 26 01:31:17 2008 -0300 V4L/DVB (7922): tuner-simple: fix tuner_warn() induced kernel oops in simple_tuner_attach() The tuner_warn() macro relies on the local variable "priv" to be a valid pointer. There was a case in simple_tuner_attach() where this cannot be the case yet, so tuner_warn() would dereference a NULL "priv" pointer. Changed the tuner_warn() to a printk() with the originally intended output format. Signed-off-by: Andy Walls Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 5cf3f5cd1f6ee0d81b75c659c732dd8dd245a350 Author: Michael Krufky Date: Sat May 24 23:49:03 2008 -0300 V4L/DVB (7919): VIDEO_AU0828 does not depend on VIDEO_DEV Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 383a211699026ee41d9726e3f5edcfa1b0071b8f Author: Michael Krufky Date: Sat May 24 23:48:16 2008 -0300 V4L/DVB (7918): au0828: remove irrelevent analog tuner standby code This code is irrelevant to this driver and should be removed. This was copied from a hack in cx88-dvb.c, which prevents noise coming from the analog tuner (via an audio patch cable from the pci card to the sound hardware) when in digital mode by muting the tda988x. This issue does not apply to this USB hybrid chip design, where a single piece of silicon handles both analog and digital demodulation. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2f1a1c7f9c10a87a6725e4b9603e4880c2059d71 Author: Michael Krufky Date: Sun May 25 13:09:51 2008 -0300 V4L/DVB (7916): dib7000p: fix dib7000p_attach when !CONFIG_DVB_DIB7000P somebody forgot to to fix this header... Thanks to Ingo Molnar for pointing this out. Tested-by: Ingo Molnar Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 70345fbe4a76621808219c506f2480b39131e575 Author: Guennadi Liakhovetski Date: Thu May 22 19:30:40 2008 -0300 V4L/DVB (7911): Remove v4l2_video_std_fps prototype declaration The v4l2_video_std_fps function has been removed by Adrian Bunk in 2004 but then its prototype re-appeared in include/media/v4l2-dev.h. Remove it. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit b4aba24186d66190b21ab64bf28f22ffc51a9c43 Author: Ingo Molnar Date: Tue May 20 08:02:33 2008 -0300 V4L/DVB (7910): usb: input layer dependency fixes testing of the -tip tree found the following build failures on 2.6.26-rc3: drivers/built-in.o: In function `ttusb_dec_disconnect': ttusb_dec.c:(.text+0xa2c95): undefined reference to `input_unregister_device' drivers/built-in.o: In function `dvb_usb_read_remote_control': dvb-usb-remote.c:(.text+0xa6a94): undefined reference to `input_event' with this config: http://redhat.com/~mingo/misc/config-Tue_May_20_03_48_57_CEST_2008.bad these are due to the media/dvb/usb layer having dependencies on INPUT functionality, without having that spelled out in the Kconfig file. this patch makes that dependency explicit (for the drivers affected), which solves the build error. Signed-off-by: Ingo Molnar Signed-off-by: Mauro Carvalho Chehab commit 45033bcf172d9965210b644f3769c9de94c33333 Author: Adrian Bunk Date: Mon May 26 14:23:49 2008 -0300 V4L/DVB (7908): always enter drivers/media/video/ After commit 039d40019f3c5e26ea50ec5af4270189f63365e1 (V4L/DVB (7898): Fix VIDEO_MEDIA Kconfig logic) VIDEO_MEDIA is no longer usable in Makefile's for deciding which directories we enter, resulting in compile errors like the following with CONFIG_VIDEO_DEV=y, CONFIG_DVB_CORE=m: <-- snip --> ... MODPOST 187 modules ... make[2]: *** [__modpost] Error 1 <-- snip --> The easiest solution is to always enter video/ Signed-off-by: Adrian Bunk Acked-by: Ingo Molnar Signed-off-by: Mauro Carvalho Chehab commit 38db143e6feaa2dc649ed8bf69d1a12f7b9c0246 Author: Adrian Bunk Date: Fri May 16 00:15:53 2008 -0300 V4L/DVB (7906): tuners/mxl5005s.c: don't define variables for enums It doesn't seem to be intended that "tuner_modu_type" and "MXL5005_ControlName" were global variables. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit 427aad6fda607914945022e916827037d2d0db3d Author: Marcin Slusarz Date: Sun May 11 19:58:59 2008 -0300 V4L/DVB (7905): check_v4l2 should return -EINVAL on error check_v4l2 always returns 0, so this change is an noop for now, but a comment says it will return something else in the future Signed-off-by: Marcin Slusarz Signed-off-by: Mauro Carvalho Chehab commit 4d3437df25325d517ee310d55989ce9630ff529e Author: Marcin Slusarz Date: Mon May 26 14:03:02 2008 -0300 V4L/DVB (7904): v4l/tuner-core: consistent handling of return values change check_mode and set_mode to return negative errors and fix all callers Signed-off-by: Marcin Slusarz Signed-off-by: Mauro Carvalho Chehab commit 7fa7b8583f14889aaceebcd8dca3093987e289f7 Author: Marcin Slusarz Date: Sun May 11 19:53:39 2008 -0300 V4L/DVB (7903): gp8psk_power_ctrl should return negative errors Signed-off-by: Marcin Slusarz Signed-off-by: Mauro Carvalho Chehab commit 4277106b4fb6edd8f52b0653841faebbf7160480 Author: Marcin Slusarz Date: Sun May 11 19:51:07 2008 -0300 V4L/DVB (7902): fix handling of tea5761_autodetection return value tea5761_autodetection returns -EINVAL on error Signed-off-by: Marcin Slusarz Signed-off-by: Mauro Carvalho Chehab commit 81b8021a71c194752e8bbb29328cecc744a47b2b Author: Andrew Morton Date: Wed May 14 23:14:04 2008 -0300 V4L/DVB (7901): zoran: use correct type for CPU flags locking-add-typecheck-on-irqsave-and-friends-for-correct-flags.patch will cause drivers/media/video/zoran_driver.c: In function 'zoran_close_end_session': drivers/media/video/zoran_driver.c:1172: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit daf20d95bff81c6fc8a8d8160e620e1f9581af02 Author: Hans Verkuil Date: Mon May 12 11:21:58 2008 -0300 V4L/DVB (7885): ivtv/cx18: add compat_ioctl entries Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ba75321193900a236bc5bbc29145e1039f74eb1b Author: Kyungmin Park Date: Wed May 7 11:54:10 2008 +0900 [MTD] [MAPS] Fix cmdlineparse handling in mapping files Now it returns the 0 if cmdlineparse not supplied. Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit 9b62d864314736fb6cc5c5db5b964d4a3c093424 Author: Eric Miao Date: Wed May 21 17:26:15 2008 +0800 [MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path Signed-off-by: Eric Miao Signed-off-by: David Woodhouse commit 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 Author: Russell King Date: Mon Jun 2 20:38:15 2008 +0100 [ARM] pxa: fix tosa.c build error Work around: arch/arm/mach-pxa/tosa.c: In function `tosa_poweroff': arch/arm/mach-pxa/tosa.c:470: error: `GPIO_OUT' undeclared (first use in this function) arch/arm/mach-pxa/tosa.c:470: error: (Each undeclared identifier is reported only once arch/arm/mach-pxa/tosa.c:470: error: for each function it appears in.) The proper fix exists in the PXA branch of my kernel git tree, which will be pushed during the next merge window. Signed-off-by: Russell King commit 1e5c594607778f551b729577b046ee5d9333cfb5 Author: surinder Date: Wed May 28 09:51:16 2008 +0100 [ARM] 5067/1: _raw_write_can_lock macro bugfix The current __raw_write_can_lock macro tests whether the lock can be locked by checking if it is equal to 0x80000000, whereas the lock should be lockable if its value is 0 i.e. unlocked state is represented by 0. Hence the macro should test the value of lock against 0 and not 0x80000000. Signed-off-by: Surinder Pal Singh Signed-off-by: Russell King commit ea6a7404da4b381b35bcec48338d376a3873ea46 Author: Philipp Zabel Date: Fri May 30 18:53:55 2008 +0100 [ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration PSKTSEL can be routed to GPIO pin 104. This configuration is used by HP iPAQ hx4700. Signed-off-by: Philipp Zabel Acked-by: Jrgen Schindele Signed-off-by: Russell King commit 106f62701fe79fd5c251e5d3e182516344882962 Author: Jonathan Cameron Date: Wed May 28 18:37:14 2008 +0100 [ARM] 5068/1: PXA2xx Additional gpio definitions Some additional alternate gpio definitions relating to FFUART and USB on the pxa27x. These are used on the xbow imote2 platform. Signed-off-by: Jonathan Cameron Signed-off-by: Russell King commit 31ab3ffb2b20cda79684a0b3a4265fd7170cdacc Author: Mike Rapoport Date: Mon Jun 2 12:58:23 2008 +0100 [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation Add the IORESOURCE_IRQ_HIGHEDGE to the DM9000 IRQ resource to stop the driver itself complaining it was not given any flags to use. Signed-off-by: Mike Rapoport Acked-by: Eric Miao Signed-off-by: Russell King commit b095723526cb80494bd5a13de0e5078f8846866a Author: Mike Rapoport Date: Mon Jun 2 12:58:24 2008 +0100 [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation Add the IORESOURCE_IRQ_HIGHEDGE to the DM9000 IRQ resource to stop the driver itself complaining it was not given any flags to use. Signed-off-by: Mike Rapoport Acked-by: Eric Miao Signed-off-by: Russell King commit 6d2545738a7c6ad1831d84ecc6483ea21c327bf4 Author: eric miao Date: Mon May 26 03:23:14 2008 +0100 [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP Signed-off-by: Eric Miao Signed-off-by: Russell King commit 759e9408ad2e7f2115ce8341854be982e0186a8c Author: Greg Ungerer Date: Sun May 25 12:35:38 2008 +0100 [ARM] 5060/1: remove unnecessary include of asm/io.h Remove unnecessary include of asm/io.h. Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit ee48a75c95145bf6af3be329cd7cbbca2ec89a2a Author: Russell King Date: Sun Jun 1 11:19:33 2008 +0100 [ARM] fix AT91 include loops AT91 has one include loop in its header files: include/asm-arm/io.h <- include/asm-arm/arch-at91/io.h <- include/asm-arm/io.h Circular include dependencies are dangerous since they can result in inconsistent definitions being provided to other code, especially if '#ifndef' constructs are used. Solve this by removing the offending includes. Built tested using my AT91 configuration. Acked-by: Andrew Victor Signed-off-by: Russell King