OSDN Git Service
Hartmut Hackmann [Mon, 2 Oct 2006 22:55:07 +0000 (19:55 -0300)]
V4L/DVB (4701): Saa713x audio fixes
This change fixes the following issues:
- resolve the SECAM D/K vs SECAM-L sound conflict
It is now possible to select the SECAM version either by the VIDEOIOC_S_STD
IO control or by the new secam= insmod option.
The driver now adapts its audio standard search list to the selected
standard.
- don't trigger a sound standard search when a LINE input is selected.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Wed, 4 Oct 2006 11:01:59 +0000 (08:01 -0300)]
V4L/DVB (4676a): Remove Kconfig item for DiB7000M support
Support for DiB7000M frontend were not included on 2.6.19, since still not
completed. Removing Kconfig item.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Keith Mannthey [Wed, 4 Oct 2006 01:25:52 +0000 (18:25 -0700)]
[PATCH] i383 numa: fix numaq/summit apicid conflict
This allows numaq to properly align cpus to their given node during
boot. Pass logical apicid to apicid_to_node and allow the summit
sub-arch to use physical apicid (hard_smp_processor_id()).
Tested against numaq and summit based systems with no issues.
Signed-off-by: Keith Mannthey <kmannth@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 3 Oct 2006 23:35:11 +0000 (16:35 -0700)]
Merge git://git./linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Samuel Tardieu [Tue, 3 Oct 2006 21:41:34 +0000 (23:41 +0200)]
Add missing maintainer countries in CREDITS
Add missing maintainer countries.
Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Christian Borntraeger [Tue, 3 Oct 2006 21:40:34 +0000 (23:40 +0200)]
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
This is a small fix for a typo in Kconfig. The default value for the block
size is 1024 bytes not 1024 kilobytes.
Signed-off-by: Christian Borntraeger <borntrae@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Riccardo Magliocchetti [Tue, 3 Oct 2006 21:39:02 +0000 (23:39 +0200)]
fix a typo in Documentation/pi-futex.txt
Signed-off-by: Riccardo Magliocchetti <riccardo@datahost.it>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Eric Sesterhenn [Tue, 3 Oct 2006 21:37:55 +0000 (23:37 +0200)]
BUG_ON conversion for fs/xfs/
This patch converts two if () BUG(); construct to BUG_ON();
which occupies less space, uses unlikely and is safer when
BUG() is disabled.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Eric Sesterhenn [Tue, 3 Oct 2006 21:37:14 +0000 (23:37 +0200)]
BUG_ON() conversion in fs/nfsd/
This patch converts an if () BUG(); construct to BUG_ON();
which occupies less space, uses unlikely and is safer when
BUG() is disabled.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Eric Sesterhenn [Tue, 3 Oct 2006 21:36:38 +0000 (23:36 +0200)]
BUG_ON conversion for fs/reiserfs
This patch converts several if () BUG(); construct to BUG_ON();
which occupies less space, uses unlikely and is safer when
BUG() is disabled. S_ISREG() has no side effects, so the
conversion is safe.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Eric Sesterhenn [Tue, 3 Oct 2006 21:34:58 +0000 (23:34 +0200)]
BUG_ON cleanups in arch/i386
This changes a couple of if() BUG(); constructs to
BUG_ON(); so it can be safely optimized away.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Eric Sesterhenn [Tue, 3 Oct 2006 21:34:11 +0000 (23:34 +0200)]
BUG_ON cleanup in drivers/net/tokenring/
This patch converts one if() BUG(); to BUG_ON();
so it can be safely optimized away.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Eric Sesterhenn [Tue, 3 Oct 2006 21:33:23 +0000 (23:33 +0200)]
BUG_ON cleanup for drivers/md/
This changes two if() BUG(); usages to BUG_ON(); so people
can disable it safely.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Linus Torvalds [Tue, 3 Oct 2006 21:32:06 +0000 (14:32 -0700)]
Merge /linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
Henrik Kretzschmar [Tue, 3 Oct 2006 21:31:30 +0000 (23:31 +0200)]
kerneldoc-typo in led-class.c
Fixes a typo in led-class.c kerneldoc.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Komal Shah [Tue, 3 Oct 2006 21:28:36 +0000 (23:28 +0200)]
debugfs: spelling fix
Change debufs_create_file() to debugfs_create_file().
Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Josh Triplett [Tue, 3 Oct 2006 21:26:16 +0000 (23:26 +0200)]
rcutorture: Fix incorrect description of default for nreaders parameter
The comment for the nreaders parameter of rcutorture gives the default as
4*ncpus, but the value actually defaults to 2*ncpus; fix the comment.
Signed-off-by: Josh Triplett <josh@freedesktop.org>
Acked-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matthew Martin [Tue, 3 Oct 2006 21:25:14 +0000 (23:25 +0200)]
parport: Remove space in function calls
This removes the space in function calls in drivers/parport/daisy.c
Signed-off-by: Matthew Martin <lihnucks@gmail.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Michal Wronski [Tue, 3 Oct 2006 21:23:27 +0000 (23:23 +0200)]
Michal Wronski: update contact info
My email has changed.
Signed-Off-By: Michal Wronski <michal.wronski@gmail.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Michael Opdenacker [Tue, 3 Oct 2006 21:21:02 +0000 (23:21 +0200)]
Spelling fix: "control" instead of "cotrol"
This patch against fixes a spelling mistake ("control" instead of "cotrol").
Signed-off-by: Michael Opdenacker <michael@free-electrons.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Michael Opdenacker [Tue, 3 Oct 2006 21:19:24 +0000 (23:19 +0200)]
reboot parameter in Documentation/kernel-parameters.txt
Documentation fix for the arm and arm26 architectures,
in which the reboot kernel parameter is set in arch/*/kernel/process.c
Signed-off-by: Michael Opdenacker <michael@free-electrons.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Rolf Eike Beer [Tue, 3 Oct 2006 21:13:02 +0000 (23:13 +0200)]
Fix copy&waste bug in comment in scripts/kernel-doc
This is obviously copied from some lines before without proper fixing.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Rolf Eike Beer [Tue, 3 Oct 2006 21:07:31 +0000 (23:07 +0200)]
remove duplicate "until" from kernel/workqueue.c
s/until until/until/
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Jim Cromie [Tue, 3 Oct 2006 21:04:37 +0000 (23:04 +0200)]
ite_gpio fix tabbage
caught some leading spaces in passing.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Uwe Zeisberger [Tue, 3 Oct 2006 21:01:26 +0000 (23:01 +0200)]
fix file specification in comments
Many files include the filename at the beginning, serveral used a wrong one.
Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Paolo Ornati [Tue, 3 Oct 2006 20:57:56 +0000 (22:57 +0200)]
Documentation: remove duplicated words
Remove many duplicated words under Documentation/ and do other small
cleanups.
Examples:
"and and" --> "and"
"in in" --> "in"
"the the" --> "the"
"the the" --> "to the"
...
Signed-off-by: Paolo Ornati <ornati@fastwebnet.it>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:55:17 +0000 (22:55 +0200)]
Fix typos in Documentation/: 'S'
This patch fixes typos in various Documentation txts. The patch addresses
some words starting with the letter 'S'.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Acked-by: Alan Cox <alan@redhat.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:54:15 +0000 (22:54 +0200)]
Fix typos in Documentation/: 'Q'-'R'
This patch fixes typos in various Documentation txts. The patch addresses
some words starting with the letters 'Q'-'R'.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:53:09 +0000 (22:53 +0200)]
Fix "can not" in Documentation and Kconfig
Randy brought it to my attention that in proper english "can not" should always
be written "cannot". I donot see any reason to argue, even if I mightnot
understand why this rule exists. This patch fixes "can not" in several
Documentation files as well as three Kconfigs.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:52:05 +0000 (22:52 +0200)]
Fix typos in Documentation/: 'N'-'P'
This patch fixes typos in various Documentation txts. The patch addresses
some words starting with the letters 'N'-'P'.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Wim Van Sebroeck [Wed, 13 Sep 2006 19:27:29 +0000 (21:27 +0200)]
[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
Return ENOTTY instead of ENOIOCTLCMD in user-visible ioctl() results
The watchdog drivers used to return ENOIOCTLCMD for bad ioctl() commands.
ENOIOCTLCMD should not be visible by the user, so use ENOTTY instead.
Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Matt LaPlante [Tue, 3 Oct 2006 20:50:39 +0000 (22:50 +0200)]
Fix typos in Documentation/: 'H'-'M'
This patch fixes typos in various Documentation txts. The patch addresses
some words starting with the letters 'H'-'M'.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:49:15 +0000 (22:49 +0200)]
Fix typos in Documentation/: 'F'-'G'
This patch fixes typos in various Documentation txts. The patch addresses
some words starting with the letters 'F'-'G'.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Linus Torvalds [Tue, 3 Oct 2006 20:48:44 +0000 (13:48 -0700)]
Merge /linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] iTCO_wdt.c shutdown patch
[WATCHDOG] iTCO_wdt.c - pci_dev_put fix
[WATCHDOG] iTCO_wdt (Intel TCO Timer) driver
[WATCHDOG] iTCO_wdt (Intel TCO Timer) driver
Russell King [Tue, 3 Oct 2006 16:36:11 +0000 (17:36 +0100)]
[PATCH] Remove me from maintainers for serial and mmc
As advertised earlier. I invite interested parties to take over and
add their own entries as they see fit.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Matt LaPlante [Tue, 3 Oct 2006 20:47:42 +0000 (22:47 +0200)]
Fix typos in Documentation/: 'D'-'E'
This patch fixes typos in various Documentation txts. This patch addresses
some words starting with the letters 'D'-'E'.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:46:31 +0000 (22:46 +0200)]
Fix typos in Documentation/: 'B'-'C'
This patch fixes typos in various Documentation txts. This patch addresses some
words starting with the letters 'B'-'C'. There are also a few grammar fixes
thrown in for Randy. ;)
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:45:33 +0000 (22:45 +0200)]
Fix some typos in Documentation/: 'A'
This patch fixes typos in various Documentation txts.
This patch addresses some words starting with the letter 'A'.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:36:44 +0000 (22:36 +0200)]
Still more typo fixes
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:34:14 +0000 (22:34 +0200)]
more misc typo fixes
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:31:37 +0000 (22:31 +0200)]
Fix several typos in drivers/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:24:43 +0000 (22:24 +0200)]
fix drivers/acpi/Kconfig typos
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:23:47 +0000 (22:23 +0200)]
fix an arch/alpha/Kconfig typo
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:22:29 +0000 (22:22 +0200)]
Typos in fs/Kconfig
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Matt LaPlante [Tue, 3 Oct 2006 20:21:02 +0000 (22:21 +0200)]
Attack of "the the"s in arch
The patch below corrects multiple occurances of "the the"
typos across several files, both in source comments and KConfig files.
There is no actual code changed, only text. Note this only affects the /arch
directory, and I believe I could find many more elsewhere. :)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Adrian Bunk [Tue, 3 Oct 2006 20:17:48 +0000 (22:17 +0200)]
remove mentionings of devfs in documentation
Now that devfs is removed, there's no longer any need to document how to
do this or that with devfs.
This patch includes some improvements by Joe Perches.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Adrian Bunk [Tue, 3 Oct 2006 20:11:20 +0000 (22:11 +0200)]
input: remove obsolete contact information
This patch removes some obsolete contact information from
Documentation/input/input.txt
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Linus Torvalds [Tue, 3 Oct 2006 20:03:40 +0000 (13:03 -0700)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix wreckage after removal of tickadj; convert to GENERIC_TIME.
[MIPS] DECstation defconfig update
[MIPS] Fix size of zones_size and zholes_size array
[MIPS] BCM1480: Mask pending interrupts against c0_status.im.
[MIPS] SB1250: Interrupt handler fixes
[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.
[MIPS] Remove Atlas and SEAD from feature-removal-schedule.
[MIPS] Remove Jaguar and Ocelot family from feature list.
[MIPS] BCM1250: TRDY timeout tweaks for Broadcom SiByte systems
[MIPS] Remove dead DECstation boot code
[MIPS] Let gcc align 'struct pt_regs' on 8 bytes boundary
Wim Van Sebroeck [Sat, 5 Aug 2006 18:59:01 +0000 (20:59 +0200)]
[WATCHDOG] iTCO_wdt.c shutdown patch
Since we are using the device driver model,
we don't need to arrange the shutdown via a
reboot_notifier.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Wim Van Sebroeck [Wed, 19 Jul 2006 20:39:13 +0000 (22:39 +0200)]
[WATCHDOG] iTCO_wdt.c - pci_dev_put fix
for_each_pci_dev calls pci_get_device (and thus
it calls pci_dev_get). So we need to do a pci_dev_put
to keep the refcounting correct.
(Thanks to Jiri Slaby <jirislaby@gmail.com>)
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Wim Van Sebroeck [Fri, 30 Jun 2006 06:44:53 +0000 (08:44 +0200)]
[WATCHDOG] iTCO_wdt (Intel TCO Timer) driver
Convert the iTCO_wdt driver to a platform device
driver.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Wim Van Sebroeck [Sun, 21 May 2006 12:37:44 +0000 (14:37 +0200)]
[WATCHDOG] iTCO_wdt (Intel TCO Timer) driver
Hardware driver for the intel TCO timer based watchdog devices.
These drivers are included in the Intel 82801 I/O Controller
Hub family (from ICH0 up to ICH7) and in the Intel 6300ESB
controller hub.
This driver will replace the i8xx_tco.c driver.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Steven Toth [Tue, 3 Oct 2006 00:35:40 +0000 (21:35 -0300)]
V4L/DVB (4699): CX24109 patch to eliminate the weird mis-tunings
A number of people have been reporting wierd tuning problems with various
cards. Yeasah tracked down the problem to a miss-read datasheet. This
resolves the problems.
Signed-off-by: Yeasah Pell <yeasah@schwide.net>
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Tue, 3 Oct 2006 02:52:48 +0000 (23:52 -0300)]
V4L/DVB (4698): Fix S-Video configuration for Pinnacle PCTV-Sat
Thanks to Edgar Toernig <froese@gmx.de> for pointing this.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Sat, 30 Sep 2006 01:37:07 +0000 (22:37 -0300)]
V4L/DVB (4689): Adding support for Nova-T-PCI PCI ID 0070:9000
Adding support for Nova-T-PCI PCI ID 0070:9000
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil [Sun, 1 Oct 2006 20:56:32 +0000 (17:56 -0300)]
V4L/DVB (4688): Fix msp343xG handling (regression from 2.6.16)
The msp3430G and msp3435G models cannot do Automatic Standard Detection.
So these should be forced to BTSC. These chips are early production versions
for the msp34xxG series and are quite rare.
The workaround for kernel 2.6.18 is to use 'standard=32' as msp3400
module option. Due to broken handling of the 'standard' option in 2.6.17 there is
no workaround possible for that kernel.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Thu, 28 Sep 2006 05:16:01 +0000 (02:16 -0300)]
V4L/DVB (4686): Cxusb: add support for DViCO FusionHDTV DVB-T Dual Digital 2
Add support for DViCO FusionHDTV DVB-T Dual Digital 2 USB, which
is identical to the usb portion of DViCO FusionHDTV DVB-T Dual Digital 1.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Sujoy Gupta [Sat, 30 Sep 2006 09:55:29 +0000 (06:55 -0300)]
V4L/DVB (4685): Fix compiler warning in drivers/media/video/video-buf.c
Using a double cast to avoid compiler warnings when building for PAE.
Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer.
Signed-off-by: Martin J. Bligh <mbligh@google.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Richard Knutsson [Fri, 29 Sep 2006 19:15:37 +0000 (16:15 -0300)]
V4L/DVB (4684): Drivers/media/video/cx88: Remove unused defined FALSE/TRUE
Remove defines of FALSE/TRUE because they are not used.
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Fri, 29 Sep 2006 15:39:36 +0000 (12:39 -0300)]
V4L/DVB (4683): Norm_notchfilter is used on just one point and argument is bogus
Removed norm_notchfilter function. All the code is bound to 4 x FSC, so, any
other filter won't work fine.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Lars Gjesse Kjellberg [Tue, 26 Sep 2006 02:44:06 +0000 (23:44 -0300)]
V4L/DVB (4681): Cx88: fix analog capture notch filter
This patch changes the setting of the cx2388x notch filter to match that of
the video capture sample frequency, removing some annoying interference
lines THAT would appear when capturing composite video. This has been tested
in PAL and NTSC TV norms.
It sets the Y/C separation luma notch filter, which removes the chroma signal
from the luma signal when using a composite input.
The luma notch filter operates at the video decoder's frequency, not the ADC's
frequency or at the frequency of the scaled video. Y/C separation happens after
the sample rate converter, before video scaling.
The datasheet provides plots of the filter response for three _video decoder_
frequencies, 4x Fsc, square pixel, and ccir601. These are the same three
frequencies for the notch filter control. It seems pretty clear that this
filter should be set based on the video decoder frequency. The cx88 driver
always uses a video decoder frequency of 4xFsc.
Signed-off-by: Lars Gjesse Kjellberg <lars.g.kjellberg@get2net.dk>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Wed, 27 Sep 2006 04:16:50 +0000 (01:16 -0300)]
V4L/DVB (4679): Fix for NULL pointer dereference oops during boot.
A fix for intermittent oops's during boot which occurs
in cx88_call_i2c_clients when dvb_attach is bringing up
the frontend.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mike Isely [Thu, 28 Sep 2006 20:53:49 +0000 (17:53 -0300)]
V4L/DVB (4675): Pvrusb2: Fix VIDIOC_INT_[G|S]_REGISTER so that it actually works now
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Randy Dunlap [Thu, 28 Sep 2006 17:03:26 +0000 (14:03 -0300)]
V4L/DVB (4674): Use NULL instead of 0 for ptrs
Use NULL instead of 0 for pointer value, eliminate sparse warnings.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Thu, 28 Sep 2006 16:48:26 +0000 (13:48 -0300)]
V4L/DVB (4673): Mark the two newer ioctls as experimental
VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS ioctls are meant
to be used to provide better support for webcams. Currently, it is not yet
used on kernel drivers.
Better to keep it marked as experimental, until we have several kernel drivers
supporting those features.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Laurent Pinchart [Thu, 28 Sep 2006 16:42:05 +0000 (13:42 -0300)]
V4L/DVB (4672): Frame format enumeration (1/2)
Add VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS ioctls to enumerate
supported frame sizes and frame intervals.
Signed-off-by: Martin Rubli <martin.rubli@epfl.ch>
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Petr Baudis [Tue, 26 Sep 2006 19:53:53 +0000 (16:53 -0300)]
V4L/DVB (4671): Support for SAA7134-based AVerTV Hybrid A16AR
This adds support for a hybrid PAL/DVB/FM card. Unfortunately I tested
only the DVB since I don't have any proper antenna available and I can
receive even the DVB just barely so; I can hear noise in the FM part but I
couldn't catch any station, then again I don't have an FM antenna either.
The PAL/FM and IR control data are based on what I harvested on the 'net.
Perhaps I or someone else will fix them if they turn out to be wrong.
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
David Hardeman [Tue, 26 Sep 2006 19:39:00 +0000 (16:39 -0300)]
V4L/DVB (4670): Allow RC5 codes 64 - 127 in ir-kbd-i2c.c
The RC5 coding has for a long time supported commands 64-127 in addition
to 0-63. This is controlled by the second bit of the RC5 packet (see
The attached patch modifies ir-kbd-i2c.c to allow for commands 64-127,
tested with a PVR350 card in combination with a programmable remote.
Signed-off-by: David Hardeman <david@hardeman.nu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Mon, 25 Sep 2006 17:14:24 +0000 (14:14 -0300)]
V4L/DVB (4669): Cx88: autodetect Club3D Zap TV2100 by subsystem id 12ab:2300
The Club3D Zap TV2100 has been reported to be a clone of the Yuan PG300 and
KWorld/VStream XPert DVB-T with cx22702
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky [Mon, 25 Sep 2006 17:09:10 +0000 (14:09 -0300)]
V4L/DVB (4668): Cx88: rename mpeg capability flags from CX88_BOARD_FOO to CX88_MPEG_FOO
The flags for mpeg capabilities are sub-optimally named as
CX88_BOARD_DVB and CX88_BOARD_BLACKBIRD, which creates some confusion.
This patch renames the above to CX88_MPEG_DVB and CX88_MPEG_BLACKBIRD.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Mon, 25 Sep 2006 15:43:45 +0000 (12:43 -0300)]
V4L/DVB (4667): Changed cx88_board .dvb and .register to an enum.
Some basic cleanup in preperation for a future patch where
the cx88-mpeg functions have to deal with the port being
used by multiple frontends in (mpeg2 hw encoder and dvb demod).
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Mon, 25 Sep 2006 15:43:42 +0000 (12:43 -0300)]
V4L/DVB (4666): Ensure the WM8775 driver is loaded generically for any board.
A generic change to cards to allow any board to specify whether
it needs the wm8775 module loaded (by the core) or not.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Steven Toth [Mon, 25 Sep 2006 15:41:53 +0000 (12:41 -0300)]
V4L/DVB (4665): Add frontend structure callback for bus acquisition.
This patch enables generic bus arbitration callbacks enabling
dvbcore frontend_open and frontend_release to pass 'acquire'
and 'release' hardware messages back into the DVB bridge frameworks.
Frameworks like cx88 can then implement single bus multiple demod
card sharing features, which would prohibit two frontends from attempting
to use a single transport bus at the same time.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mike Isely [Sun, 24 Sep 2006 02:47:50 +0000 (23:47 -0300)]
V4L/DVB (4664): Pvrusb2: Don't use videodev.h; use v4l2-dev.h in its place
The function prototype needed in pvrusb2-v4l2.c has been moved to
v4l2-dev.h. Track that change.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mike Isely [Sun, 24 Sep 2006 01:30:50 +0000 (22:30 -0300)]
V4L/DVB (4663): Pvrusb2: Get rid of private global context array brain damage
A previous attempt to deal with the upcoming loss of
video_set_drvdata() and video_get_drvdata() resulted in logic which
causes a circular locking dependency - also known as a deadlock. This
changeset attacks the problem in a different manner, using a technique
that no longer requires the problematic mutex (or that private global
array either).
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mike Isely [Sun, 24 Sep 2006 01:26:52 +0000 (22:26 -0300)]
V4L/DVB (4662): Pvrusb2: Implement VIDIOC_INT_[G|S]_REGISTER
Implement VIDIOC_INT_SET_REGISTER and VIDIOC_INT_GET_REGISTER for the
pvrusb2 driver. This is a debugging aid which will not be enabled
unless CONFIG_VIDEO_ADV_DEBUG has been enabled.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mike Isely [Sun, 24 Sep 2006 01:19:29 +0000 (22:19 -0300)]
V4L/DVB (4661): Pvrusb2: improve 24XXX config option description
The CONFIG_VIDEO_PVRUSB2_24XXX is not nearly as "experimental" as the
description suggests. So refine the description to better match reality.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Mauro Carvalho Chehab [Sat, 30 Sep 2006 09:54:14 +0000 (06:54 -0300)]
V4L/DVB (4660): Some cleanups at helper chips menu
Rearranged itens, so that decoders came first;
cx25840 is, in fact, an audio and video decoder;
Fixed some incorrect upercases;
Removed the word "chip" for some audio processors at item name;
Removed the word "driver" for some item names;
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Wed, 20 Sep 2006 09:06:58 +0000 (06:06 -0300)]
V4L/DVB (4658): Another fix because of dvb_attach
Fixed mt2060-usage with dvb_attach
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Wed, 20 Sep 2006 09:06:11 +0000 (06:06 -0300)]
V4L/DVB (4657): Power control of the device for dual board
Corrected power control of the device for dual boards
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Wed, 20 Sep 2006 07:42:23 +0000 (04:42 -0300)]
V4L/DVB (4656): Fixed dvb_attach for dib3000mc in dibusb
When converting the dib3000mc-driver to dvb_attach I forgot to invert the check for NULL.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Wed, 20 Sep 2006 07:40:14 +0000 (04:40 -0300)]
V4L/DVB (4655): Removed compilation warnings
Removed compilation warnings for unused statics and locals
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Wed, 20 Sep 2006 07:37:18 +0000 (04:37 -0300)]
V4L/DVB (4654): Added module parameter force_lna_activation
Added a module parameter for force the activation of any LNA on a board.
Suggest by Steve Toth.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 26 Sep 2006 07:10:14 +0000 (04:10 -0300)]
V4L/DVB (4654a): dib700m is not yet ready.
Removing include for kernel 2.6.19
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:56 +0000 (12:51 -0300)]
V4L/DVB (4653): Misc fixes for Nova-T 500
- forward the clock to the slave undivided
- when sleeping the 3000 do not shutdown the clock
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:53 +0000 (12:51 -0300)]
V4L/DVB (4652): Misc fixes for DiB3000MC and Nova-T 500
- make the timing frequency update work.
- fix AGC calibration for Nova-T 500
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:49 +0000 (12:51 -0300)]
V4L/DVB (4651): Adding another USB product ID for Nova-T 500
Adding another USB product ID for the Nova-T 500. Reported by Jose Alberto Reguero.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:46 +0000 (12:51 -0300)]
V4L/DVB (4650): Misc fixes for dib0700 download
Several fixes for dib0700-module. (Firmware error checking, dependency)
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:43 +0000 (12:51 -0300)]
V4L/DVB (4649): Merged VP702x support to dvb-usb multi input
The fixed support for the VP70x (supports only StarBox2) is now in sync with
latest changes in the dvb-usb framework.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:40 +0000 (12:51 -0300)]
V4L/DVB (4648): Hauppauge Nova-T 500 support added
This changeset finalizes the support of the Hauppauge Nova-T 500 (Dual DVB-T).
It adds correct AGC setting for the 3000P, correct firmware download state
detection.
Additionally it fixes the mt2060-driver to be able to be used with dvb_attach.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:37 +0000 (12:51 -0300)]
V4L/DVB (4647): Added module for DiB0700 based devices
Added module for DiB0700 based USB devices. This module is preliminary and
untested (because of a lack of test devices) but should work.
Further commits will be necessary to make it work properly.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:33 +0000 (12:51 -0300)]
V4L/DVB (4646): Misc. changes, DiB3000MC, MT2060
Changed the attach-function of the dib3000mc-driver to return only one
frontend. In case of multiple dib3000-chips on one board, one has to call the
i2c-enumeration manually before.
Added a field to Microtune 2060 config to output the clock to other
tuners/device on a board.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:30 +0000 (12:51 -0300)]
V4L/DVB (4645): Added new file for multiple input rewrite
Forgot to add usb-urb.c which is new after adding support for multiple inputs
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Tue, 19 Sep 2006 15:51:27 +0000 (12:51 -0300)]
V4L/DVB (4644): Multi-input fix for dtt200u
Small fix for multi input for dtt200u module.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Patrick Boettcher [Sat, 30 Sep 2006 09:53:48 +0000 (06:53 -0300)]
V4L/DVB (4643): Multi-input patch for DVB-USB device
This patch is the first commit of the Multiple Input Patch for the DVB-USB frame
work.
It changes the DVB-USB-device to be able to have more than one streaming input
(e.g. multiple DVB-T sources) on one device. This is a necessary feature for
the upcoming DiB7700 driven devices.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Ralf Baechle [Mon, 2 Oct 2006 15:54:48 +0000 (16:54 +0100)]
[MIPS] Fix wreckage after removal of tickadj; convert to GENERIC_TIME.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Maciej W. Rozycki [Tue, 3 Oct 2006 11:27:38 +0000 (12:27 +0100)]
[MIPS] DECstation defconfig update
Sanitise a number of settings for the DECstation.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Fri, 29 Sep 2006 18:34:06 +0000 (03:34 +0900)]
[MIPS] Fix size of zones_size and zholes_size array
Commit
f06a96844a577c43249fce25809a4fae07407f46 broke MIPS.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Tue, 3 Oct 2006 13:42:02 +0000 (14:42 +0100)]
[MIPS] BCM1480: Mask pending interrupts against c0_status.im.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Maciej W. Rozycki [Tue, 3 Oct 2006 11:42:02 +0000 (12:42 +0100)]
[MIPS] SB1250: Interrupt handler fixes
Mask cp0.status against cp0.cause. Additionally, spurious interrupts are
not recorded.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>