| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
fs/nilfs2/super.c
fs/xfs/linux-2.6/xfs_super.c
|
|
|
|
'nuc', 'pl', 'spear' and 'versatile' into devel
|
|
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
|
|
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
|
|
The probe method used by i2c_new_probed_device() may not be suitable
for all cases. Let the caller provide its own, optional probe
function.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
Having both IO-mapping.txt and io-mapping.txt in Documentation/
was confusing and/or bothersome to some people, so rename
IO-mapping.txt to bus-virt-phys-mapping.txt. Also update
Documentation/00-INDEX for both of these files.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Kees Bakker <kees.bakker@xs4all.nl>
Cc: Keith Packard <keithp@keithp.com>
|
|
|
|
Add support for W83667HG-B (very similar to the W83667HG).
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
|
|
SMSC's EMC2103 family of temperature/fan controllers have 1
onboard and up to 3 external temperature sensors, and allow
closed-loop control of one fan. This patch adds support for
them.
Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
|
|
Fault files are for hardware failures that can be reported. So far
we've seen chips reporting such failures for temperature sensors and
fans, but not for voltages. Remove in[0-*]_fault for now. It can be
added back later if really needed, but I doubt it.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
|
|
Add currX_alarm, currX_min_alarm, currX_max_alarm and currX_beep
attributes to the hwmon sysfs API.
currX_min_alarm and currX_max_alarm are already supported by the LTC4215
and LTC4245 drivers. currX_alarm is supported by the LTC4261 driver.
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
|
|
Added _lcrit and _crit to voltage attributes.
Added _lcrit to temperature attributes.
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
|
|
Add support for exposing all GPIO pins as analog voltages. Though this is
not an ideal use of the chip, some hardware engineers may decide that the
LTC4245 meets their design requirements when studying the datasheet.
The GPIO pins are sampled in round-robin fashion, meaning that a slow
reader will see stale data. A userspace application can detect this,
because it will get -EAGAIN when reading from a sysfs file which contains
stale data.
Users can choose to use this feature on a per-chip basis by using either
platform data or the OF device tree (where applicable).
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
|
|
|
|
This changes the TCM handling so that a fixed area is reserved at
0xfffe0000-0xfffeffff for TCM. This areas is used by XScale but
XScale does not have TCM so the mechanisms are mutually exclusive.
This change is needed to make TCM detection more dynamic while
still being able to compile code into it, and is a must for the
unified ARM goals: the current TCM allocation at different places
in memory for each machine would be a nightmare if you want to
compile a single image for more than one machine with TCM so it
has to be nailed down in one place.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
via following scripts
FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
sed -i \
-e 's/lmb/memblock/g' \
-e 's/LMB/MEMBLOCK/g' \
$FILES
for N in $(find . -name lmb.[ch]); do
M=$(echo $N | sed 's/lmb/memblock/g')
mv $N $M
done
and remove some wrong change like lmbench and dlmb etc.
also move memblock.c from lib/ to mm/
Suggested-by: Ingo Molnar <mingo@elte.hu>
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
|
Conflicts:
drivers/hid/hid-ids.h
|
|
Nilfs has "discard" mount option which issues discard/TRIM commands to
underlying block device, but it lacks a complementary option and has
no way to disable the feature through remount.
This adds "nodiscard" option to resolve this imbalance.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
|
|
Nilfs enables write barriers by default and has "nobarrier" mount
option to disable this feature. But it lacks the complementary option
and has no way to re-enable the feature on remount.
This adds "barrier" option to resolve this imbalance.
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
|
|
* /home/v4l/v4l/for_linus:
V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference
V4L/DVB: uvcvideo: Power line frequency control doesn't support GET_MIN/MAX/RES
V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank screen
V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CARDLIST.tuner
V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tuner
V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner
V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs
V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig
V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes
|
|
* tag 'v2.6.35-rc4': (355 commits)
Linux 2.6.35-rc4
module: initialize module dynamic debug later
ARM: 6205/1: perf: ensure counter delta is treated as unsigned
perf, x86: Fix incorrect branches event on AMD CPUs
of/dma: fix build breakage in ppc4xx adma driver
MAINTAINERS: Add an entry for i7core_edac
i7core_edac: Avoid doing multiple probes for the same card
i7core_edac: Properly discover the first QPI device
amd64_edac: Fix syndrome calculation on K8
ARM: 6202/1: Do not ARM_DMA_MEM_BUFFERABLE on RealView boards with L210/L220
ARM: 6201/1: RealView: Do not use outer_sync() on ARM11MPCore boards with L220
drm/i915: fix page flip finish vs. prepare on plane B
correct console log level when ERST ACPI table is not found
drm/i915: fix hibernation since i915 self-reclaim fixes
drm/i915: change default panel fitting mode to preserve aspect ratio
drm/i915: fix uninitialized variable warning in i915_setup_compression()
drm/i915: take struct_mutex in i915_dma_cleanup()
drm/i915: Fix CRT hotplug regression in 2.6.35-rc1
i915: fix ironlake edp panel setup (v4)
drm/i915: don't access FW_BLC_SELF on 965G
...
Conflicts:
drivers/staging/tm6000/tm6000-alsa.c
|
|
* /home/v4l/v4l/patchwork: (25 commits)
V4L/DVB: gspca - sq930x: Add some comments for sensor mt9v111
V4L/DVB: gspca - vc032x: Add trace of USB exchanges
V4L/DVB: gspca - vc032x: Stop the USB exchanges on error
V4L/DVB: gspca - vc032x: Add some comments
V4L/DVB: gspca - main: Don't use the frame buffer flags
V4L/DVB: gspca - main: Possible race condition in queue management
V4L/DVB: remove obsolete conditionalizing on DVB_DIBCOM_DEBUG
V4L/DVB: lgs8gxx: remove firmware for lgs8g75
V4L/DVB: si470x: -EINVAL overwritten in si470x_vidioc_s_tuner()
V4L/DVB: IR/mceusb: more streamlining of device init
IR/mceusb: remove unused vars from gen1 init
V4L/DVB: lirc: use unlocked_ioctl
V4L/DVB: [-next] IR: jvc-decoder needs BITREVERSE
V4L/DVB: IR/lirc_dev: fix locking in lirc_dev_fop_read
V4L/DVB: Retrieve firmware for az6027
V4L/DVB: v4l2-dev: fix memory leak
V4L/DVB: dvb_frontend: fix typos in comments and one function
V4L/DVB: tda10048: clear the uncorrected packet registers when saturated
V4L/DVB: tda10048: fix bitmask for the transmission mode
V4L/DVB: tda10048: fix the uncomplete function tda10048_read_ber
...
|
|
Signed-off-by: Renzo Dani <arons7@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
The CAPI variant of the Gigaset drivers can, in combination with
capidrv, now fully replace the legacy ISDN4Linux variant. All
reported problems have been fixed. So remove the EXPERIMENTAL tag
from the Kconfig option selecting it, and adapt the documentation
accordingly to encourage users to switch to it.
Impact: documentation/status update, no functional change
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Add a paragraph to the driver documentation describing how to make
internal and external calls.
Impact: documentation
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Mention that the CAPI controller methods load_firmware() and
reset_ctr() are asynchronous, and should signal completion.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
* 'staging/other' of /home/v4l/v4l/patchwork: (1162 commits)
V4L/DVB: uvcvideo: Add support for Manta MM-353 Plako
V4L/DVB: uvcvideo: Don't use stack-based buffers for USB transfers
V4L/DVB: uvcvideo: Define control information bits using macros
V4L/DVB: uvcvideo: Support menu controls in the control mapping API
V4L/DVB: uvcvideo: Make button controls work properly
V4L/DVB: uvcvideo: Add support for absolute pan/tilt controls
V4L/DVB: IR/imon: auto-configure another 0xffdc device variant
V4L/DVB: cx88: Let the user disable IR support
V4L/DVB: cx88: Move I2C IR initialization
V4L/DVB: cx23885: add support for new model revisions of the HVR12xx board family
V4L/DVB: xc5000: Fix a few warnings
V4L/DVB: IR/mceusb: userspace buffer copy moved out of driver
V4L/DVB: IR TX: incoming IR buffer now an int pointer
V4L/DVB: cx23885: Convert cx23885-input to use new in kernel IR pulse decoders
V4L/DVB: cx23885: Convert from struct card_ir to struct cx23885_ir_input for IR Rx
V4L/DVB: gspca - main: Simplify image building
V4L/DVB: gspca - gl860: Fix a compilation warning
V4L/DVB: vpif: removing VPIF config variables
V4L/DVB: vpfe_capture: Create separate Kconfig file for davinci devices
V4L/DVB: Fix compilation breakage caused by commit fb3eaa5f3ffbc204788a155294718054c0e97e93
...
|
|
family
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
This patch adds support for TechnoTrend TT-budget T-3000 DVB-T card.
Signed-off-by: Vadim Catana <vadim.catana@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
On 05/29/10 01:30, Jean-Francois Moine wrote:
> On Fri, 28 May 2010 13:03:28 -0400
> Amerigo Wang<amwang@redhat.com> wrote:
>
>> Subject: [PATCH 6/6] Remove obsolete zc0301 v4l driver
>>
>> Duplicate functionality with the gspca_zc3xx driver, zc0301 only
>> supports 2 USB-ID's (because it only supports a limited set of
>> sensors) wich are also supported by the gspca_zc3xx driver
>> (which supports 53 USB-ID's in total).
>
> You forgot to remove the conditionnal compilation in the gspca_zc3xx
> driver (USB_DEVICE(0x046d, 0x08ae) in gspca/zc3xx.c)
>
Right, thanks for pointing this out!
Attached is the updated patch, please use this one instead.
Thanks!
Duplicate functionality with the gspca_zc3xx driver, zc0301 only
supports 2 USB-ID's (because it only supports a limited set of
sensors) wich are also supported by the gspca_zc3xx driver
(which supports 53 USB-ID's in total).
Signed-off-by: Amerigo Wang <amwang@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
obsolete v4l1 driver replaced by gspca_stv0680
Signed-off-by: Amerigo Wang <amwang@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
Only used by obsoleted v4l1 driver
Signed-off-by: Amerigo Wang <amwang@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
>From a97df96226e89d3539be93ddb5a8df3a2f7edcb6 Mon Sep 17 00:00:00 2001
obsolete v4l1 driver replaced by gspca_ov519
Signed-off-by: Amerigo Wang <amwang@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
obsolete v4l1 driver replaced by gspca_ov519
Signed-off-by: Amerigo Wang <amwang@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
obsolete v4l1 driver replaced by gspca_stv06xx
Signed-off-by: Amerigo Wang <amwang@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
* staging/tm6000: (29 commits)
tm6000: Partially revert some copybuf logic
tm6000: Be sure that the new buffer is empty
tm6000: Fix copybuf continue logic Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
tm6000: audio packet has always 180 bytes
tm6000: Improve set bitrate routines used by alsa
tm6000-alsa: Implement a routine to store data received from URB
tm6000-alsa: Fix several bugs at the driver initialization code
tm6000: avoid unknown symbol tm6000_debug
tm6000: Add a callback code for buffer fill
tm6000: Use an emum for extension type
tm6000-alsa: rework audio buffer allocation/deallocation
tm6000: Avoid OOPS when loading tm6000-alsa module
tm6000: Fix compilation breakages
V4L/DVB: Staging: tm6000: Fix coding style issues
V4L/DVB: tm6000: move dvb into a separate kern module
V4L/DVB: tm6000: rewrite init and fini
V4L/DVB: tm6000: Fix Video decoder initialization
V4L/DVB: tm6000: rewrite copy_streams
V4L/DVB: tm6000: add DVB support for tuner xc5000
V4L/DVB: tm6000: set variable dev_mode in function tm6000_start_stream
...
|
|
* staging/rc: (23 commits)
DocBook/media: Add LIRC DocBook to media.html
V4L/DVB: IR/lirc: add docbook info covering lirc device interface
V4L/DVB: IR: add empty lirc pseudo-keymap
V4L/DVB: IR: add ir-core to lirc userspace decoder bridge driver
V4L/DVB: IR: add lirc device interface
V4L/DVB: IR/mceusb: add tx callback functions and wire up
V4L/DVB: IR: add tx callbacks to ir-core
V4L/DVB: IR/mceusb: kill pinnacle-device-specific nonsense
V4L/DVB: IR/mceusb: misc cleanups and init fixes
V4L/DVB: IR/mceusb: use the proper ir-core device unregister function
V4L/DVB: IR/imon: use the proper ir-core device unregister function
V4L/DVB: [-next] media/IR: nec-decoder needs to select BITREV
V4L/DVB: ir-core: move decoding state to ir_raw_event_ctrl
ir-core: allow specifying multiple protocols at one open/write
ir-core: Add support for disabling all protocols
ir-core: Rename sysfs protocols nomenclature to rc-5 and rc-6
ir-core: Remove magic numbers at the sysfs logic
V4L/DVB: ir-core: centralize sysfs raw decoder enabling/disabling
V4L/DVB: ir-core: partially convert ir-kbd-i2c.c to not use ir-functions.c
V4L/DVB: ir-core: partially convert cx88 to not use ir-functions.c
...
|
|
* staging/other:
V4L/DVB: cx25821: Fix bad whitespacing
V4L/DVB: cx25821: Add a kernel level at printk's
V4L/DVB: cx25821: Make comments C99 compliant
V4L/DVB: cx25821: Removed duplicate code and cleaned up
V4L/DVB: drivers/media/video/zoran: Use kmemdup
V4L/DVB: dvb-usb-init.c: white space changes in dvb-usb-init
V4L/DVB: drivers/media/video/tlg2300: Use kmemdup
V4L/DVB: Increment DVB API version
DocBook/dvb: Update spec to reflect the current FE capabilities
V4L/DVB: Add FE_CAN_TURBO_FEC
V4L/DVB: drivers/media/video/uvc: Use kmemdup
V4L/DVB: drivers/media/video/gspca: Use kmemdup
V4L/DVB: drivers/media/dvb/dvb-usb/dib0700: CodingStyle fixes
V4L/DVB: drivers/media/dvb/dvb-usb/dib0700: fix return values
V4L/DVB: drivers/media/video/pvrusb2: Add missing mutex_unlock
V4L/DVB: vivi: fix depends again
V4L/DVB: smscoreapi/w9968cf: drivers/media: Remove unnecesary kmalloc casts
V4L/DVB: Fix kernel Oops when number of NetUP Dual DVB-S2-CI cards more than DVB_MAX_ADAPTERS limit
|
