summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 David S. Miller2005-09-132-3/+21
|\
| * [Bluetooth] Add ignore parameters to the HCI USB driverMarcel Holtmann2005-09-132-3/+21
| | | | | | | | | | | | | | | | | | This patch adds the module parameters ignore_csr and ignore_sniffer to the HCI USB driver. This allows an easier use of CSR ROM chips that need an additional initialization routine and the Frontline sniffers. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog Linus Torvalds2005-09-139-43/+2244
|\ \
| * | [WATCHDOG] pcwd_pci-include+WDIOC_SETOPTIONS-patchWim Van Sebroeck2005-09-121-20/+24
| | | | | | | | | | | | | | | | | | | | | Clean-up includes Check results for start + stop in the WDIOC_SETOPTIONS ioctl call Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] sbc8360+w83977f_wdt-consolidate_CONFIG_WATCHDOG_NOWAYOUT_handlingWim Van Sebroeck2005-09-122-12/+2
| | | | | | | | | | | | | | | | | | | | | Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess and replaces it with common define in linux/watchdog.h. Signed-Off-By: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] w83977f-watchdog-driver.patchJose Miguel Goncalves2005-09-123-0/+562
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a project for my company I've needed to use the watchdog device in a PCM-5335 SBC from AAEON. The watchdog timer is from a Winbond's SuperIO chip, the W83977F. I've made this driver based on two others already on the kernel tree, the w83877f_wdt and the wdt977. Signed-off-by: Jose Goncalves <jose.goncalves@inov.pt> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] New SBC8360 watchdog driver (revised)Ian E. Morgan2005-09-113-0/+433
| | | | | | | | | | | | | | | | | | | | | | | | New SBC8360 watchdog driver patch From: Ian E. Morgan <imorgan@webcon.ca> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fix2.patchWim Van Sebroeck2005-09-111-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The device/watchdog has a fixed timeout/heartbeat. So we don't support the WDIOC_SETTIMEOUT ioctl call and we also may not set the WDIOF_SETTIMEOUT flag. Cc: Andrey Panin <pazke@donpac.ru> Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fixAndrew Morton2005-09-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add fixed timeout comments Cc: Andrey Panin <pazke@donpac.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog.patchAndrey Panin2005-09-113-0/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds driver for IBM Automatic Server Restart watchdog hardware found in some IBM eServer xSeries machines. This driver is based on the ugly driver provided by IBM. Driver was tested on IBM eServer 226. Signed-off-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [WATCHDOG] i6300.h-removal-patchDavid Hardeman2005-09-112-74/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the attached patch moves the content of drivers/char/watchdog/i6300.h into drivers/char/watchdog/i6300.c, since it is the only file using the defines there is no real reason to have a separate header. Also cleaned up the comments a bit and added myself to the copyright holders. Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [WATCHDOG] i6300esb.c-2-bugs-little-cleanup.patchJiri Slaby2005-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In i6300esb.c watchdog card driver were 2 bugs (misused pc_match_device and pci_dev_put wasn't called in one error case) and one little cleanup was done (long line was converted to a shorter one with using built-in macro). Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [WATCHDOG] i6300esb.c-pci_dev_put+nowayout-patchNaveen Gupta2005-09-111-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One pci_dev_put was misused (there was one case without putting the device). Changed nowayout according to other drivers. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [WATCHDOG] i6300esb-set_correct_reload_register_bitNaveen Gupta2005-09-112-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch writes into bit 8 of the reload register to perform the correct 'Reload Sequence' instead of writing into bit 4 of Watchdog for Intel 6300ESB chipset. Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [WATCHDOG] i6300esb.c-WDT_ENABLE-bugNaveen Gupta2005-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch sets the WDT_ENABLE bit of the Lock Register to enable the watchdog and WDT_LOCK bit only if nowayout is set. The old code always sets the WDT_LOCK bit of watchdog timer for Intel 6300ESB chipset. So, we end up locking the watchdog instead of enabling it. Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * | [WATCHDOG] removes pci_find_device from i6300esb.cJiri Slaby2005-09-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes pci_find_device to pci_get_device (encapsulated in for_each_pci_dev) in i6300esb watchdog card with appropriate adding pci_dev_put. Generated in 2.6.13-rc5-mm1 kernel version. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] i6300esb.patchDavid Hardeman2005-09-114-0/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wrote earlier to the list[1] asking for a driver for the watchdog included in the 6300ESB chipset. I got a 2.4 driver via private email from Ross Biro which I've changed into what I hope resembles a 2.6 driver (which was done by looking a lot at the watchdog drivers already in the 2.6 tree). I've attached the result, and I'm hoping to get some feedback on the coding as a first step. I can't actually test it on the hardware right now as I won't have physical access until April. So my own tests have been limited to "compiles-without-warnings" and "can-be-insmodded-in-other-machine-without-oops". [1] http://marc.theaimsgroup.com/?l=linux-kernel&m=110711079825794&w=2 [2] http://marc.theaimsgroup.com/?l=linux-kernel&m=110711973917746&w=2 Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] mv64x60_wdt.patchJames Chapman2005-09-103-0/+257
| | | | | | | | | | | | | | | | | | | | | Add mv64x60 (Marvell Discovery) watchdog support. Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] Kconfig+Makefile-clean2Wim Van Sebroeck2005-09-102-22/+23
| | | | | | | | | | | | | | | | | | | | | Clean the Kconfig+Makefile according to a sorted list of the drivers of each architecture (and sub-architecture). Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | [WATCHDOG] s3c2410_wdt.c-state_warning.patchArnaud Patard (Rtp)2005-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've noticed that the patch from Ben Dooks (commit af4bb822bc65efb087cd36b83789f22161a6515b on your git tree) is introducing a warning. It's using 'u32 state' instead of 'pm_message_t state'. I've attached a one liner to fix it. Signed-Off-By: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* | | [PATCH] drivers/video: Replace custom macro with isdigit()Tobias Klauser2005-09-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the custom CHAR_IS_NUM() macro with isdigit() from <linux/ctype.h> Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> 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] matroxfb adjustmentsJan Beulich2005-09-131-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some adjustments to the matroxfb code, for one part preventing the display to be disabled for longer than necessary, and for the other part to make information about the frame buffer position available so that a kernel debugger might obtain that before the initial mode change. Finally, some return code corrections to fit the generic fb code. Signed-off-by: Jan Beulich <jbeulich@novell.com> Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] fbcon: constify font dataJan Beulich2005-09-1313-34/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | const-ify the font control structures and data, to make somewhat better guarantees that these are not modified anywhere in the kernel. Specifically for a kernel debugger to share this information from the normal kernel code, such a guarantee seems rather desirable. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: "Antonino A. Daplas" <adaplas@hotpop.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] minor fbcon_scroll adjustmentJan Beulich2005-09-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An adjustment to the SM_DOWN case of fbcon_scroll to match the behavior of SM_UP. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: "Antonino A. Daplas" <adaplas@hotpop.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] v4l: fixup on cx88_dvb for Dvico HDTV5 GoldMauro Carvalho Chehab2005-09-131-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bug fix for DViCO FusionHDTV5 Gold to avoid noise after frontend init. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] SharpSL: Add an input keyboard driver for Zaurus cxx00 seriesRichard Purdie2005-09-133-0/+490
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a input driver for the keyboard found on the Zaurus Cxx00 series (Spitz, Akita, Borzoi). Its based on corgikbd but there are enough subtle differences to justify a separate driver. Signed-Off-by: Richard Purdie <rpurdie@rpsys.net> Cc: Vojtech Pavlik <vojtech@suse.cz> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] SharpSL: Abstract model specifics from Corgi Backlight driverRichard Purdie2005-09-131-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate out the Sharp Zaurus c7x0 series specific code from the Corgi backlight driver. Abstract model/machine specific functions to corgi_lcd.c via sharpsl.h This enables the driver to be used by the Zaurus cxx00 series. Signed-Off-by: Richard Purdie <rpurdie@rpsys.net> Cc: Vojtech Pavlik <vojtech@suse.cz> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] SharpSL: Abstract c7x0 specifics from Corgi Touchscreen driverRichard Purdie2005-09-132-31/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate out the Sharp Zaurus c7x0 series specific code from the Corgi Touchscreen driver. Use the new functions in corgi_lcd.c via sharpsl.h for hsync handling and pass the IRQ as a platform device resource. Move a function prototype into the w100fb header file where it belongs. This enables the driver to be used by the Zaurus cxx00 series. Signed-Off-by: Richard Purdie <rpurdie@rpsys.net> Cc: Vojtech Pavlik <vojtech@suse.cz> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] pktcdvd: BUG_ON cleanupsPeter Osterlund2005-09-131-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some redundant BUG_ON() statements in pktcdvd and move one run-time check to compile-time. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] pktcdvd: use kcalloc and kzallocPeter Osterlund2005-09-131-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use kcalloc and kzalloc in pktcdvd. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] pktcdvd: more accurate I/O accountingPeter Osterlund2005-09-131-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the /proc statistics, only count writes that upper layers have requested. Don't count additional writes created inside the packet driver to satisfy the requirement to only write full packets. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] pktcdvd: documentation updatePeter Osterlund2005-09-131-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | Update the "theory of operation" description. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] pktcdvd: fix bogus BUG_ONPeter Osterlund2005-09-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the packet writing driver, if the drive reports a packet size larger than the driver can handle, bail out safely instead of triggering a BUG_ON. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] cciss: SCSI tape info for /procMike Miller2005-09-131-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SCSI host and device info not elsewhere available to /proc/scsi/cciss/* Namely, connect cciss device instance with scsi host number, and give scsi host number, bus, target, lun, devicetype, and 8-byte cciss LUNID for each tapedrive/medium changer attached to a controller For instance: # cat /proc/scsi/cciss/2 cciss0: SCSI host: 2 c2b0t0l0 01 0x0000000000000001 Signed-off-by: Stephen M. Cameron <steve.cameron@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] cciss: One Button Disaster Recovery supportMike Miller2005-09-131-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for "One Button Disaster Recovery" devices to the cciss driver. (OBDR devices are tape drives which can pretend to be cd-rom devices temporarily. Once booted the device can be reverted to a tape drive and data recovery operations can be automatically begun.) This is an enhancement request by a vendor/partner working on One Button Disaster Recovery. Signed-off-by: Stephen M. Cameron <steve.cameron@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] cciss: fix for DMA brokenessMike Miller2005-09-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CCISS driver seems to loose track of DMA mappings created by it's fill_cmd() routine. Neither callers of this routine are extracting the DMA address created in order to do the unmap. Instead, they simply try to unmap 0x0. It's easy to see this problem on an x86_64 system when using the "swiotlb=force" boot option. In this case, the driver is leaking resources of the swiotlb and not causing a sync of the bounce buffer. Signed-off-by: Alex Williamson <alex.williamson@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] cciss: bug fix in cciss_remove_oneMike Miller2005-09-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug in cciss_remove_one. A set of braces was missing for the if statement causing an Oops on driver unload. Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] cciss: direct lookup for command completionsMike Miller2005-09-134-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the way we complete commands. In the old method when we got a completion we searched our command list from the top until we find it. This method uses a tag associated with each command (not SCSI command tagging) to index us directly to the completed command. This helps performance. Signed-off-by: Don Brace <dab@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] cciss: new disk register/deregister routinesMike Miller2005-09-132-190/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes a couple of functions dealing with configuration and replaces them with new functions. This implementation fixes some bugs associated with the ACUXE. It also allows a logical volume to be removed from the middle without deleting all volumes behind it. If a user has 5 logical volumes and decides he wants to reconfigure volume number 3, he can now do that without removing volumes 4 & 5 first. This code has been tested in our labs against all application software. Signed-off-by: Chase Maupin <chase.maupin@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] cciss: busy_initializing flagMike Miller2005-09-132-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a flag called busy_initializing. If there are multiple controllers in a server AND the HP agents are running it's possible the agents may try to poll a card that is still initializing if the driver is removed and then added again. Signed-off-by: Don Brace <dab@hp.com> Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] cciss: new controller pci/subsystem idsMike Miller2005-09-131-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds new PCI and subsystem ID's that finally made the spec. It also include a name change for one controller. I know there's a lot of duplicat names but the fw folks wanted this for the different implementations. Even though the same ASIC is used it may be embedded on some platforms, standup card in others, and a mezzanine in other servers. Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] Remove unnecessary check_region references in commentsPeter Osterlund2005-09-1315-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove check_region references from comments and printk statements so that searching for real users of this deprecated function gets easier. Signed-off-by: Peter Osterlund <petero2@telia.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] i2c-keywest warning fixAndrew Morton2005-09-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Unused variable. Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] pcmcia: add another orinoco_cs idKomuro2005-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add new id to orinoco_cs (corega PCCB-11). Signed-off-by: <komurojun-mbn@nifty.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] ide: clean up the garbage in eighty_ninty_threeAlan Cox2005-09-131-35/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the foot long pile of festering garbage in eighty_ninty_three with some actual clean code. All the ifdefs are fixed and havent changed since 2.4 Acked-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] pcmcia: warn on IOCTL usageDominik Brodowski2005-09-131-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | More visible user information of scheduled feature removal. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] fbdev Kconfig fixAntonino A. Daplas2005-09-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix compile error if CONFIG_FB_I810_I2C is 'y' and CONFIG_I2C = 'm'. 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/base/*: use kzalloc instead of kmalloc+memsetJiri Slaby2005-09-135-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bunch of memset bugs too. Signed-off-by: Lion Vollnhals <webmaster@schiggl.de> Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Fix up more strange byte writes to the PCI_ROM_ADDRESS config wordLinus Torvalds2005-09-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a dword thing, and the value we write is a dword. Doing a byte write to it is nonsensical, and writes only the low byte, which only contains the enable bit. So we enable a nonsensical address (usually zero), which causes the controller no end of problems. Trivial fix, but nasty to find. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 Linus Torvalds2005-09-1217-144/+1057
|\ \ \
OpenPOWER on IntegriCloud