aboutsummaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2005-11-01[PATCH] missing platform_device.h includesAl Viro
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6Linus Torvalds
Manual fixups for some clashes due to re-indenting.
2005-11-01[PATCH] tlclk build fixAndrew Morton
drivers/char/tlclk.c: In function `tlclk_init': drivers/char/tlclk.c:775: warning: implicit declaration of function `platform_device_register_simple' Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01[PATCH] TPM compile fixChris Wright
CC drivers/char/tpm/tpm_nsc.o drivers/char/tpm/tpm_nsc.c:277: error: `platform_bus_type' undeclared here (not in a function) ... CC drivers/char/tpm/tpm_atmel.o drivers/char/tpm/tpm_atmel.c:175: error: `platform_bus_type' undeclared here (not in a function) Make sure to include proper headers. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-01Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds
2005-11-01Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
2005-11-02Merge iSeries include file moveStephen Rothwell
2005-11-02Merge ../linux-2.6Paul Mackerras
2005-11-02merge filename and modify references to iseries/vio.hKelly Daly
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02merge filename and modify references to iSeries/mf.hKelly Daly
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02powerpc: exclude powerbook sleep code with CONFIG_PPC64 and CONFIG_PMPaul Mackerras
We were getting powerbook sleep code included, and giving compile errors, with CONFIG_PM=y on a 64-bit build. This excludes that code so the kernel will compile. One day BenH will implement on sleep on the G5... Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-02merge filename and modify references to iseries/hv_types.hKelly Daly
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02merge filename and modify references to iseries/hv_lp_event.hKelly Daly
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02merge filename and modify reference to iseries/hv_lp_config.hKelly Daly
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02merge filename and modify references to iseries/hv_call_event.hKelly Daly
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-01[ARM] 3079/1: Fix typo in i2c-iop3xx.c (invalid pointer passed to ↵Dan Williams
release_mem_region) Patch from Dan Williams * If request_irq fails then a call to release_mem_region will be made with an invalid pointer. * Two formatting fixes Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-11-01[WATCHDOG] adds device_driver .owner fieldWim Van Sebroeck
Initialise the .owner field of the device driver with the module that owns it, for easier tracking of device driver ownership. (probably also better for sysfs...) Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2005-11-01[WATCHDOG] pcwd_pci.c update commentsWim Van Sebroeck
update copyright + update bells and whistles driver for v2.6 Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2005-11-01[WATCHDOG] w83627hf_wdt trivial typoPozsar Balazs
The most trivial typo fix in the world. Signed-off-by: Pozsar Balazs <pozsy@uhulinux.hu> Signed-off-by: Pádraig Brady <P@draigBrady.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2005-11-01[WATCHDOG] s3c2410 wdt - add .owner fieldBen Dooks
Initialise the .owner field of the device driver with the module that owns it, for easier tracking of device driver ownership. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2005-11-01[BLOCK] aoe: update for combined io statisticsJens Axboe
Signed-off-by: Jens Axboe <axboe@suse.de>
2005-11-01[BLOCK] Unify the seperate read/write io stat fields into arraysJens Axboe
Instead of having ->read_sectors and ->write_sectors, combine the two into ->sectors[2] and similar for the other fields. This saves a branch several places in the io path, since we don't have to care for what the actual io direction is. On my x86-64 box, that's 200 bytes less text in just the core (not counting the various drivers). Signed-off-by: Jens Axboe <axboe@suse.de>
2005-11-01[BLOCK] Update read/write block io statistics at completion timeJens Axboe
Right now we do it at queueing time, which works alright for reads (since they are usually sync), but not for async writes since we can queue io a lot faster than we can complete it. This makes the vmstat output look extremely bursty. Signed-off-by: Jens Axboe <axboe@suse.de>
2005-11-01merge filename and modify references to iseries/hv_call.hKelly Daly
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-10-31Don't touch USB controller IO registers when they are disabledLinus Torvalds
The USB "handoff" code is an early PCI quirk to make sure we own the USB controller (as opposed to the BIOS/SMM). But if the controller isn't even enabled yet, don't try to access it. Acked-by: Paul Mackerras <paulus@samba.org> (who had an alternate patch) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-31[SCSI] ips: Fix initialization bug with kdumpJack Hammer
If I/O is active on the adapter, and an unexpected interrupt is pending during initialization, the driver blows it's brains out. Since the driver didn't initiate the I/O, the data in it's internal tables will contain NULL pointers. When this condition is detected, a "flush cache and reset" is performed. The flush cache allows any pending "lazy writes" that the adapter is processing to complete ( a "must have" for a RAID adapter ) and the reset puts the adapter back into a known, good state. Signed-off-by: Jack Hammer <jack_hammer@adaptec.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2005-10-31[PATCH] revert ide-scsi highmem cleanupAndrew Morton
Jeff Garzik <jgarzik@pobox.com> points out that this was wrong: we need to disable local interrupts while holding KM_IRQ0 due to IRQ sharing. And holding interrupts off during a big PIO opration is expensive, so we only want to do that if we know the page was highmem. So revert commit 17fd47ab4d33e764216b87006d8118fa050b4c92 Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-31[PATCH] i386: CONFIG_PC removalArthur Othieno
CONFIG_PC is left-over cruft after the introduction of CONFIG_X86_PC with the subarch split. Remove it, and fixup the remaining users to depend on CONFIG_X86_PC instead. Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-31[ARM] Convert EBSA110 network driver to a platform driverRussell King
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-10-31[PATCH] noop-iosched: avoid corrupted request mergingJens Axboe
Tejun Heo notes: "I'm currently debugging this. The problem is that we are using the generic dispatch queue directly in the noop sched and merging is NOT allowed on dispatch queues but generic handling of last_merge tries to merge requests. I'm still trying to verify this, so I'll be back with results soon." In the meantime, disable merging for noop by setting REQ_NOMERGE in elevator_noop_add_request(). Eventually, we should add a noop_list and do the dispatching like in the other io schedulers. Merging is still beneficial for noop (and it has always done it). Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-31[PATCH] Fix on-the-fly switch from cfq i/o schedulerJens Axboe
Don't clear ->elevator_data on exit, if we are switching queues we are overwriting the data of the new io scheduler. Signed-off-by: Jens Axboe <axboe@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-31Merge branch 'upstream-linus' of ↵Linus Torvalds
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
2005-10-31Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds
Manual #include fixups for clashes - there may be some unnecessary
2005-10-31[IPoIB] cleanups: fix comment, remove useless variablesRoland Dreier
Minor cleanups: fix a misleading comment, and get rid of attr_mask variables that are only used to hold constants (just use the constants directly). Signed-off-by: Roland Dreier <rolandd@cisco.com>
2005-10-31[IB] mthca: Avoid SRQ free WQE list corruptionRoland Dreier
Fix wqe_to_link() to use a structure field that we know is definitely always unused for receive work requests, so that it really avoids the free list corruption bug that the comment claims it does. Signed-off-by: Roland Dreier <rolandd@cisco.com>
2005-10-31[IB] uverbs: Avoid NULL pointer deref on CQ async eventRoland Dreier
Userspace CQs that have no completion event channel attached end up with their cq_context set to NULL. However, asynchronous events like "CQ overrun" can still occur on such CQs, so add a uverbs_file member to struct ib_ucq_object that we can follow to deliver these events. Signed-off-by: Roland Dreier <rolandd@cisco.com>
2005-10-31[SERIAL] Arrange better identification of portsRussell King
Folk seem to get confused when they see two or more ttyS0 ports appearing at boot time. One comes from the legacy table, and one from PNP. Hence, display the bus ID of the device which supplied the port. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2005-10-31Input: adbhid - fix OOPS introduced by dynalloc conversionPaul Mackerras
The problem is that adbhid[]->input is NULL, so the kernel oopses with a null pointer dereference as soon as a key is pressed. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2005-10-31Input: lkkbd - fix debug message in lkkbd_interrupt()Dmitry Torokhov
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2005-10-31Input: pcspkr - fix setting name and phys for the deviceDmitry Torokhov
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2005-10-31Input: fix input_dev registration messageDmitry Torokhov
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2005-10-31Input: evdev - allow querying SW state from compat ioctlDmitry Torokhov
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2005-10-31Input: evdev - allow querying EV_SW bits from compat_ioctlDmitry Torokhov
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2005-10-30Merge branch 'upstream'Jeff Garzik
2005-10-30[libata] locking rewrite (== fix)Jeff Garzik
A lot of power packed into a little patch. This change eliminates the sharing between our controller-wide spinlock and the SCSI core's Scsi_Host lock. As the locking in libata was already highly compartmentalized, always referencing our own lock, and never scsi_host::host_lock. As a side effect, this change eliminates a deadlock from calling scsi_finish_command() while inside our spinlock.
2005-10-30[libata] ata_tf_to_host cleanupsJeff Garzik
Integrate ata_exec() and ata_tf_to_host() into their only caller, ata_bus_edd(). Rename ata_tf_to_host_nolock() to ata_tf_to_host(). This makes locking a bit easier to review, and may help pave the way for future changes.
2005-10-31Merge ../linux-2.6 by handPaul Mackerras
2005-10-30Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds
2005-10-30Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
2005-10-30Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds