aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* V4L/DVB (4706): Do not enable VIDEO_V4L2 unconditionallyMaciej W. Rozycki2006-10-04
| | | | | | | | | The VIDEO_V4L2 config setting is enabled unconditionally, even for configurations with no support for this subsystem whatsoever. The following patch adds the necessary dependency. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixupHartmut Hackmann2006-10-04
| | | | | | | The variable fixup could be used uninitialized. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM boardHartmut Hackmann2006-10-04
| | | | | | | This is a analog DVB-T hybrid board Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (4702): Fix: set antenna input for DVB-T for Asus P7131 Dual hybridHermann Pitton2006-10-04
| | | | | | | | | This patch forces the correct antenna input input in DVB-T mode for this card. Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* V4L/DVB (4701): Saa713x audio fixesHartmut Hackmann2006-10-04
| | | | | | | | | | | | | 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>
* V4L/DVB (4676a): Remove Kconfig item for DiB7000M supportMauro Carvalho Chehab2006-10-04
| | | | | | | 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>
* [PATCH] i383 numa: fix numaq/summit apicid conflictKeith Mannthey2006-10-03
| | | | | | | | | | | 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>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-10-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Add missing maintainer countries in CREDITSSamuel Tardieu2006-10-03
| | | | | | | | | | | | | | Add missing maintainer countries. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix bytes <-> kilobytes typo in Kconfig for ramdiskChristian Borntraeger2006-10-03
| | | | | | | | | | | | | | | | 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>
| * fix a typo in Documentation/pi-futex.txtRiccardo Magliocchetti2006-10-03
| | | | | | | | | | Signed-off-by: Riccardo Magliocchetti <riccardo@datahost.it> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * BUG_ON conversion for fs/xfs/Eric Sesterhenn2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * BUG_ON() conversion in fs/nfsd/Eric Sesterhenn2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * BUG_ON conversion for fs/reiserfsEric Sesterhenn2006-10-03
| | | | | | | | | | | | | | | | | | | | 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>
| * BUG_ON cleanups in arch/i386Eric Sesterhenn2006-10-03
| | | | | | | | | | | | | | | | 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>
| * BUG_ON cleanup in drivers/net/tokenring/Eric Sesterhenn2006-10-03
| | | | | | | | | | | | | | | | 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>
| * BUG_ON cleanup for drivers/md/Eric Sesterhenn2006-10-03
| | | | | | | | | | | | | | | | 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>
| * kerneldoc-typo in led-class.cHenrik Kretzschmar2006-10-03
| | | | | | | | | | | | | | Fixes a typo in led-class.c kerneldoc. Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * debugfs: spelling fixKomal Shah2006-10-03
| | | | | | | | | | | | | | 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>
| * rcutorture: Fix incorrect description of default for nreaders parameterJosh Triplett2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * parport: Remove space in function callsMatthew Martin2006-10-03
| | | | | | | | | | | | | | 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: update contact infoMichal Wronski2006-10-03
| | | | | | | | | | | | | | My email has changed. Signed-Off-By: Michal Wronski <michal.wronski@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Spelling fix: "control" instead of "cotrol"Michael Opdenacker2006-10-03
| | | | | | | | | | | | | | | | 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>
| * reboot parameter in Documentation/kernel-parameters.txtMichael Opdenacker2006-10-03
| | | | | | | | | | | | | | | | 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>
| * Fix copy&waste bug in comment in scripts/kernel-docRolf Eike Beer2006-10-03
| | | | | | | | | | | | | | | | 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>
| * remove duplicate "until" from kernel/workqueue.cRolf Eike Beer2006-10-03
| | | | | | | | | | | | | | s/until until/until/ Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * ite_gpio fix tabbageJim Cromie2006-10-03
| | | | | | | | | | | | caught some leading spaces in passing. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * fix file specification in commentsUwe Zeisberger2006-10-03
| | | | | | | | | | | | | | 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>
| * Documentation: remove duplicated wordsPaolo Ornati2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix typos in Documentation/: 'S'Matt LaPlante2006-10-03
| | | | | | | | | | | | | | | | | | | | 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>
| * Fix typos in Documentation/: 'Q'-'R'Matt LaPlante2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * Fix "can not" in Documentation and KconfigMatt LaPlante2006-10-03
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix typos in Documentation/: 'N'-'P'Matt LaPlante2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * Fix typos in Documentation/: 'H'-'M'Matt LaPlante2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * Fix typos in Documentation/: 'F'-'G'Matt LaPlante2006-10-03
| | | | | | | | | | | | | | | | 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>
| * Fix typos in Documentation/: 'D'-'E'Matt LaPlante2006-10-03
| | | | | | | | | | | | | | | | 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>
| * Fix typos in Documentation/: 'B'-'C'Matt LaPlante2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * Fix some typos in Documentation/: 'A'Matt LaPlante2006-10-03
| | | | | | | | | | | | | | | | | | | | 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>
| * Still more typo fixesMatt LaPlante2006-10-03
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * more misc typo fixesMatt LaPlante2006-10-03
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix several typos in drivers/Matt LaPlante2006-10-03
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * fix drivers/acpi/Kconfig typosMatt LaPlante2006-10-03
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * fix an arch/alpha/Kconfig typoMatt LaPlante2006-10-03
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Typos in fs/KconfigMatt LaPlante2006-10-03
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Attack of "the the"s in archMatt LaPlante2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * remove mentionings of devfs in documentationAdrian Bunk2006-10-03
| | | | | | | | | | | | | | | | | | 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>
| * input: remove obsolete contact informationAdrian Bunk2006-10-03
| | | | | | | | | | | | | | This patch removes some obsolete contact information from Documentation/input/input.txt Signed-off-by: Adrian Bunk <bunk@stusta.de>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2006-10-03
|\ \ | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
| * | [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()Wim Van Sebroeck2006-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2006-10-03
|\| | | | | | | | | | | | | | | | | | | | | | | * 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