summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6David S. Miller2006-02-131-13/+4
|\
| * [Bluetooth] Fix firmware loading problem of BT3C driverMarcel Holtmann2006-02-131-13/+4
| | | | | | | | | | | | | | | | | | | | Before the PCMCIA subsystem was fully integrated into the device and driver model, the BT3C driver had to workaround this when loading the firmware. This workaround is broken and makes the driver oops when loading the firmware. This patch removes this workaround and uses now the provided device structure from the PCMCIA subsystem. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
* | [PATCH] Remove "RV370 5B60 [Radeon X300 (PCIE)]" from DRI listDave Jones2006-02-131-1/+0
|/ | | | | | | | | | | | | | | | | I get a machine check exception, triple fault, or NMI watchdog lockup when DRI gets enabled on this card. (And Mauro Tassinari <mtassinari@cmanet.it> reports hung kernels too in http://lkml.org/lkml/2006/1/26/97) [ Adrian Bunk also states that this is the only RV350 entry for an RV370 in our lists, which implies that it's just buggy ] Cc: Adrian Bunk <bunk@stusta.de> Cc: Dave Jones <davej@redhat.com> Cc: Mauro Tassinari <mtassinari@cmanet.it> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] orinoco: support smc2532wJesse Allen2006-02-121-0/+1
| | | | | | | | | | | The orinoco wireless driver can support the SMC 2532W-B PC Card, so add the id for it. Signed-off-by: Jesse Allen <the3dfxdude@gmail.com> Cc: Pavel Roskin <proski@gnu.org> Cc: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [WATCHDOG] pcwd.c - update module version infoWim Van Sebroeck2006-02-121-2/+7
| | | | | | Update the module version defines. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] pcwd.c show card info patchWim Van Sebroeck2006-02-121-78/+79
| | | | | | | Put all code for showing the card's boot info in one sub-routine. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] pcwd.c move get_support to pcwd_check_temperature_supportWim Van Sebroeck2006-02-121-7/+7
| | | | | | | Rename get_support function to pcwd_check_temperature_support so that it is clearer what the function does. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] pcwd.c Control Status #2 patchWim Van Sebroeck2006-02-121-11/+13
| | | | | | Add Control Status #2 bits (with defines) Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] pcwd.c private data struct patchWim Van Sebroeck2006-02-121-102/+104
| | | | | | more private data of the card to one struct. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] pcwd.c card_found-- fix.Wim Van Sebroeck2006-02-121-0/+1
| | | | | | | When doing a __devexit from a card we should also decrement the cards_found counter. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] pcwd.c add comments + tabsWim Van Sebroeck2006-02-121-34/+37
| | | | | | | add extra comments for the include files changes spaces by tabs where it is appropriate. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] sa1100_wdt.c sparse clean (2)Ian Campbell2006-02-121-5/+7
| | | | | | | | | The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean. (similar to the other watchdog drivers) Signed-off-by: Ian Campbell <icampbell@arcom.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [PATCH] fbdev: video_setup() warning fixAndrew Morton2006-02-111-0/+2
| | | | | | | | drivers/video/fbmem.c:1567: warning: 'video_setup' defined but not used Acked-by: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] nvidiafb: Add support for Geforce4 MX 4000Antonino A. Daplas2006-02-111-0/+2
| | | | | | | | Add support for Geforce4 MX 4000 (0x185) Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] drivers/video/Kconfig: remove unused BUS_I2C optionAdrian Bunk2006-02-111-5/+0
| | | | | | | | | | | | The BUS_I2C option is neither available (since there is no VISWS option in the kernel) nor does it have any effect - so why not remove it? Based on a report by Jean-Luc Leger <reiga@dspnet.fr.eu.org>. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] tipar fixesAndrew Morton2006-02-111-3/+12
| | | | | | | | | | | | | | | | | | - tipar_open(): fix unsigned comparison - tipar_open(): don't permit NULL pardevice (probably unneeded given the above fix). - tipar_init_module(): handle the situation where parport_register_driver() failed to register any devices (parport_register_driver() drops the ->attach return value on the floor). This probably makes fixes #1 and #2 unneeded. - tipar_init_module(): fix various error-path resource leaks. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: fix sclp memory corruption in tty pages listPeter Oberparleiter2006-02-111-8/+5
| | | | | | | | | | | | | | | | | When the sclp interface takes very long to serve a request, the sclp core driver will report a failed request to the sclp tty driver even though the request is still being processed by the sclp interface. Eventually the sclp interface completes the request and updates some fields in the request buffer which leads to a corrupted tty pages list. The next time function sclp_tty_write_room is called, the corrupted list will be traversed, resulting in an oops. To avoid this remove the busy retry limit and increase retry intervals. Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] s390: fix locking in __chp_add() and s390_subchannel_remove_chpid()Cornelia Huck2006-02-111-5/+5
| | | | | | | | | | | Fix locking in __chp_add() and s390_subchannel_remove_chpid(): Need to disable/enable because they are always called from a thread (and not directly from a machine check...) Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2006-02-101-14/+0
|\
| * [SERIAL] Remove incorrect code from ioc4 serial driverRussell King2006-02-101-14/+0
| | | | | | | | | | | | | | | | | | | | | | Serial drivers in general should not write uart_info->flags - they're private to serial_core. Serial drivers have no need to fiddle with tty->alt_speed, nor manipulate TTY_IO_ERROR in tty->flags. Fix the ioc4 serial driver for both these points by simply removing the offending code. Acked-by: pfg@sgi.com Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [PATCH] tty buffering stall fixPaul Fulghum2006-02-101-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | Prevent stalled processing of received data when a driver allocates tty buffer space but does not immediately follow the allocation with more data and a call to schedule receive tty processing. (example: hvc_console) This bug was introduced by the first locking patch for the new tty buffering. Signed-off-by: Paul Fulghum <paulkf@microgate.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] wrong firmware location in IPW2100 Kconfig entryJesper Juhl2006-02-101-1/+1
|/ | | | | | | | | | | | Firmware should go into /lib/firmware, not /etc/firmware. Found by Alejandro Bonilla. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'upstream-fixes'Jeff Garzik2006-02-09689-17282/+25317
|\
| * Merge branch 'master'Jeff Garzik2006-02-09282-4451/+8086
| |\
| | * Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds2006-02-081-1/+1
| | |\
| | | * [MMC] Remove extra character in AU1XXX MMC Kconfig entryJordan Crouse2006-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An obvious vi fat finger on my part. Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2006-02-0820-58/+58
| | |\ \
| | | * | [SERIAL] 8250_pci: add new PCI serial card supportYoichi Yuasa2006-02-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds new PCI serial card support. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [SERIAL] ip22zilog: Whitespace cleanup.Ralf Baechle2006-02-082-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [SERIAL] PPC32 CPM_UART: update to utilize the new TTY flip APIVitaly Bordug2006-02-081-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces old direct usage of tty->flip stuff with relative flip API calls. Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [SERIAL] Fix compile error in 8250_au1x00.cJordan Crouse2006-02-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DB1550 actually doesn't have a UART2. Remove it from the list. Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [SERIAL] 8250 serial console update uart_8250_port ierKumar Gala2006-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some embedded PowerPC (MPC834x) systems an extra byte would some times be required to flush data out of the fifo. serial8250_console_write() was updating the IER in hardware without also updating the copy in uart_8250_port. This causes issues functions like serial8250_start_tx() and __stop_tx() to misbehave. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [SERIAL] uart_port flags member should use UPF_*Russell King2006-02-052-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert usage of ASYNC_* to UPF_*. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [SERIAL] uart_port iotype member should use UPIO_*Russell King2006-02-0515-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert usage of SERIAL_IO_* to UPIO_*. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-02-081-0/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | Manual conflict merge of arch/arm/Kconfig
| | | * | | [ARM] 3283/1: S3C2400 - defines the number of serial portsLucas Correia Villa Real2006-02-081-0/+4
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lucas Correia Villa Real This patch defines the number of serial ports on the S3C2400. Signed-off-by: Lucas Correia Villa Real <lucasvr@gobolinux.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | Merge branch 'for-linus2' of ↵Linus Torvalds2006-02-087-62/+55
| | |\ \ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
| | | * | | [PATCH] m32r_sio iomem annotationsAl Viro2006-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | | * | | [PATCH] mark HISAX_AMD7930 as brokenAl Viro2006-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | | * | | [PATCH] type-safe min() in prism54Al Viro2006-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we do min() on u8 and small integer constant; cast the latter to u8. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | | * | | [PATCH] synclink_gt is PCI-onlyAl Viro2006-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | | * | | [PATCH] sn3 iomem annotations and fixesAl Viro2006-02-081-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | | * | | [PATCH] drivers/media/video __user annotations and fixesAl Viro2006-02-081-48/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * compat_alloc_user_space() returns __user pointer * copying between two userland areas is copy_in_user(), not copy_from_user() * dereferencing userland pointers is bad * so's get_user() from local variables ... plus usual __user annotations Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | | * | | [PATCH] arm: fix dependencies for MTD_XIPAl Viro2006-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MTD_XIP depends on having working asm/mtd-xip.h; it's not just per-architecture (arm-only, as current Kconfig would have it), but actually per-subarch as well. Introduced a new symbol (ARCH_MTD_XIP) set by arch Kconfig; MTD_XIP depends on it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| | * | | | ppc: fix up trivial Kconfig config selectionLinus Torvalds2006-02-081-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quoth BenH: "Ok, looks like I forgot to update the Kconfig for the new i2c driver, it should select I2C_POWERMAC instead. Do you want a new patch or can you just fix it there ?" Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | | [PATCH] powerpc: Thermal control for dual core G5sBenjamin Herrenschmidt2006-02-0713-199/+1474
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a windfarm module, windfarm_pm112, for the dual core G5s (both 2 and 4 core models), keeping the machine from getting into vacuum-cleaner mode ;) For proper credits, the patch was initially written by Paul Mackerras, and slightly reworked by me to add overtemp handling among others. The patch also removes the sysfs attributes from windfarm_pm81 and windfarm_pm91 and instead adds code to the windfarm core to automagically expose attributes for sensor & controls. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2006-02-071-26/+27
| | |\ \
| | | * \ Merge ../linux-2.6Paul Mackerras2006-02-07550-14418/+22103
| | | |\ \
| | | * | | [PATCH] sem2mutex: drivers/macintosh/windfarm_core.cIngo Molnar2006-01-201-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | semaphore to mutex conversion. the conversion was generated via scripts, and the result was validated automatically via a script as well. build and boot tested. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Paul Mackerras <paulus@samba.org>
| | * | | | [PATCH] sg gfp_t annotationsAl Viro2006-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
OpenPOWER on IntegriCloud