Linus Torvalds
22a3e233ca
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
...
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained
Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
2006-06-30 15:39:30 -07:00
Eric Sesterhenn
91a079196f
V4L/DVB (4289): Missing statement in drivers/media/dvb/frontends/cx22700.c
...
Stumbled over this because of coverity (id #492 ),
seems like we are missing a return statement here and fail
to do proper bounds checking. If this assumption is false
we should at least change the identation to make it clear
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-30 15:59:51 -03:00
Saqeb Akhter
ccd214b273
V4L/DVB (4284): Cx24123: fix set_voltage function according to the specs
...
The set_voltage function in cx24123.c was corrected to match how it is
described in the CX24123 specs, producing the correct behaviour for cards
that require it.
Acked-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Saqeb Akhter <johoja@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-30 15:59:45 -03:00
Manu Abraham
70d906354f
V4L/DVB (4282): Fix: use swzigzag for swalgo
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-30 15:59:43 -03:00
Andrew de Quincey
c5e768a1ec
V4L/DVB (4277): Fix CI interface on PRO KNC1 cards
...
The original driver had a restriction that if a card as an saa7113 chip,
then it cannot have a CI interface. This is not the case.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-30 15:59:40 -03:00
Andrew de Quincey
fd6decfbb8
V4L/DVB (4276): Fix CI on old KNC1 DVBC cards
...
These cards do not need the tda10021 configuration change when data is
streamed through a CAM module. This disables it for these ones.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-30 15:59:39 -03:00
Trent Piepho
1b172e0c4e
V4L/DVB (4275): The FE_SET_FRONTEND_TUNE_MODE ioctl always returns EOPNOTSUPP
...
When someone added the front-end ioctl FE_SET_FRONTEND_TUNE_MODE, they
forgot to set the return value to 0. It always returns EOPNOTSUPP,
causing problems for programmers who actually check for error conditions.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-30 15:59:37 -03:00
Jörn Engel
6ab3d5624e
Remove obsolete #include <linux/config.h>
...
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-06-30 19:25:36 +02:00
Adrian Bunk
9aaeded72f
typo fixes: bandwith -> bandwidth
...
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-06-30 18:19:55 +02:00
Greg Kroah-Hartman
890fbae281
[PATCH] devfs: Last little devfs cleanups throughout the kernel tree.
...
Just removes a few unused #defines and fixes some comments due to
devfs now being gone.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-06-26 12:25:09 -07:00
Greg Kroah-Hartman
ff23eca3e8
[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree
...
Also fixes up all files that #include it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-06-26 12:25:08 -07:00
Greg Kroah-Hartman
8ab5e4c15b
[PATCH] devfs: Remove devfs_remove() function from the kernel tree
...
Removes the devfs_remove() function and all callers of it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-06-26 12:25:07 -07:00
Greg Kroah-Hartman
7c69ef7974
[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree
...
Removes the devfs_mk_cdev() function and all callers of it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-06-26 12:25:07 -07:00
Greg Kroah-Hartman
95dc112a57
[PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree
...
Removes the devfs_mk_dir() function and all callers of it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-06-26 12:25:06 -07:00
Tim Kaiser
61391e0446
V4L/DVB (4219): Av7110: analog sound output of DVB-C rev 2.3
...
Added support for the msp34x5 audio dac. Analog sound output of
Technotrend DVB-C 2300 (aka Hauppauge Nexus-CA) works now.
Signed-off-by: Tim Kaiser <timkaiser@t-online.de>
Signed-off-by: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-26 09:21:26 -03:00
Manu Abraham
4a4edcca22
V4L/DVB (4217): Fix a misplaced closing bracket/else, which caused swzigzag not to be called
...
Thanks to Oliver Endriss for spotting this.
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-26 09:21:20 -03:00
Manu Abraham
d772bd03bc
V4L/DVB (4211): Fix an Oops for all fe that have get_frontend_algo == NULL
...
Thanks to Johannes Stezenbach for pointing it out
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-26 09:20:49 -03:00
Mauro Carvalho Chehab
b57e5578f9
Fixes some sync issues between V4L/DVB development and GIT
...
Some changes didn't went ok to -git, probably due to changes at merging
patches.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:24 -03:00
Cameron Hutchinson
442d15d5d8
V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
...
Signed-off-by: Cameron Hutchinson <camh@xdna.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:21 -03:00
Yeasah Pell
ceee526617
V4L/DVB (4185): Conditionally enable 5 byte diseqc commands
...
Signed-off-by: Yeasah Pell <yeasah@schwide.net>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:20 -03:00
Adrian Bunk
9ce8b68fc0
V4L/DVB (4184): Static variables mustn't be EXPORT_SYMBOL 'ed
...
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:20 -03:00
Manu Abraham
1fd57f60f8
V4L/DVB (4182): Comment out MMI functions for now
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:20 -03:00
Henrik Sjoberg
1f19456d97
V4L/DVB (4181): Fix CA Info and Application Info
...
Signed-off-by: Henrik Sjoberg <hsjo@epact.se>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:20 -03:00
Manu Abraham
3e357fd8a2
V4L/DVB (4180): Initial go at MMI
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:20 -03:00
Manu Abraham
cdd4208c05
V4L/DVB (4179): VLF fixes for DCT
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:19 -03:00
Manu Abraham
7ef53b1ab7
V4L/DVB (4178): Replace NEWTUNE with TS188
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:19 -03:00
Manu Abraham
63ad4e445d
V4L/DVB (4177): DCTNEW and ATSC fixes
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:19 -03:00
Sigmund Augdal Helberg
77e0be1210
V4L/DVB (4176): Bug-fix: Fix memory overflow
...
Do not overflow kernel memory when more than BT878_MAX devices are
present.
Signed-off-by: Sigmund Augdal Helberg <sigmund@snap.tv>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:19 -03:00
Manu Abraham
b32474cb83
V4L/DVB (4175): Fix a bug in tuner detection
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:18 -03:00
Manu Abraham
de1e6ec9f2
V4L/DVB (4174): Distinguish between STV0299 and MB86A15 based NIM's
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:18 -03:00
Manu Abraham
9500c7b05b
V4L/DVB (4173): Dprintk macro beautification
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:18 -03:00
Sigmund Augdal Helberg
6cd94745fb
V4L/DVB (4172): Remove spurious newlines in dprintk's. Add dst(card-num) as prefix in dprintk
...
Signed-off-by: Sigmund Augdal Helberg <sigmund@snap.tv>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:18 -03:00
Manu Abraham
5aef20aeff
V4L/DVB (4171): Fix Daughterboard detection
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:18 -03:00
Bryan Scott
3da2f4c0c6
V4L/DVB (4170): ATSC typecheck bugfix
...
Signed-off-by: Bryan Scott <sirbryan@gmail.com>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:17 -03:00
Manu Abraham
4e7024bd32
V4L/DVB (4169): Add more Firmware and Tuner names
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:17 -03:00
Manu Abraham
1da5e8d3cf
V4L/DVB (4168): ATSC tuner doesn't have variable length field
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:17 -03:00
Manu Abraham
364f255af7
V4L/DVB (4167): Add Board Names
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:17 -03:00
Manu Abraham
351634d27a
V4L/DVB (4166): Fix string length
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:17 -03:00
Manu Abraham
b633c6d6a3
V4L/DVB (4165): Add in tuner names
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:16 -03:00
Manu Abraham
396cffd63e
V4L/DVB (4164): Add DVB-S specific demod names
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:16 -03:00
Manu Abraham
1c4e7339e5
V4L/DVB (4163): Initialize ATSC frontend
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:16 -03:00
Manu Abraham
c65f1c5709
V4L/DVB (4162): Explicit defining of type is not necessary with MULTI_FE
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:15 -03:00
Manu Abraham
cdd393ccbf
V4L/DVB (4161): Utilize the device specific algorithm callbacks
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:15 -03:00
Manu Abraham
0249ef16fa
V4L/DVB (4160): Use device specific algorithms
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:15 -03:00
Manu Abraham
8cfba6301c
V4L/DVB (4159): Implement tuning algorithm as a module parameter
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:15 -03:00
Manu Abraham
2e506a0faf
V4L/DVB (4158): Make ASIC RESET Conditional
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:15 -03:00
Manu Abraham
ed3d1065a4
V4L/DVB (4157): Add support for VP-3250 ATSC card
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:14 -03:00
Manu Abraham
bc7386ba43
V4L/DVB (4156): Add basic ATSC support to DST
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:14 -03:00
Manu Abraham
4821fb1d84
V4L/DVB (4155): ATSC frontend support
...
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:14 -03:00
Dave Jones
ec675bce40
V4L/DVB (4149): Fix up funky logic in dvb
...
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-06-25 02:05:13 -03:00