summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-06-201-1/+6
|\
| * [PATCH] ARM: 2701/1: free up ixp2000 timer 4 for the watchdogLennert Buytenhek2005-06-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lennert Buytenhek The IXP2000 has four timers, but if we're on an A-step IXP2800, timer 2 and 3 don't work. We need two timers for timekeeping (one for the timer interrupt and one for tracking missed jiffies), so on early IXP2800s we have no other choice but to use timer 1 and 4 for that, but on all other IXP2000s we'd rather leave timer 4 free since that's the only timer we can use for the watchdog. So, on buggy IXP2000s (i.e. the A-step IXP2800) we use timer 4 for tracking missed jiffies, and on all all non-buggy IXP2000s (i.e. everything but the A-step IXP2800) we use timer 2. On a pre-production IXP2800, this patch should print these messages on boot: Enabling IXP2800 erratum #25 workaround Unable to use IXP2000 watchdog due to IXP2800 erratum #25 On any non-buggy IXP2800 (as well as on IXP2400s) you shouldn't see anything at all, and the watchdog should be usable again. Signed-off-by: Lennert Buytenhek Signed-off-by: Deepak Saxena Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | aic7xxx/aic79xx_osm: revert completely bogus ahd_linux_queue() patchJeff Garzik2005-06-191-4/+4
| |
* | fc4/fc: fix warnings and errors related to recent SCSI EH updatesJeff Garzik2005-06-191-4/+2
|/
* [PATCH] console blanking oops fixJan Beulich2005-06-181-0/+4
| | | | | | | | | | | When significant delays happen during boot (e.g. with a kernel debugger, but the problem has also seen in other cases) the timeout for blanking the console may trigger, but the work scheduler may not have been initialized, yet. schedule_work() will oops over the null keventd_wq. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge 'upstream-2.6.13' branch of ↵Linus Torvalds2005-06-184-38/+150
|\ | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * Merge /spare/repo/linux-2.6/Jeff Garzik2005-06-1849-245/+318
| |\
| * | [PATCH] sata_svw: bump version numberNarendra Sankar2005-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bump sata_svw.c version number to indicate support for BCM5785(HT1000) Southbridge SATA controller. Signed-off-by: Narendra Sankar <nsankar@broadcom.com> diff -uNr linux-2.6.12-rc5/drivers/scsi/sata_svw.c linux-2.6.12-rc5.brcm/drivers/scsi/sata_svw.c
| * | [libata] ahci: finish ATAPI support (hopefully)Jeff Garzik2005-06-041-12/+8
| | |
| * | Merge of /spare/repo/libata-dev branch bridge-detect2005-06-041-2/+33
| |\ \
| | * \ Automatic merge of /spare/repo/linux-2.6/.git branch HEAD2005-06-03308-11288/+30413
| | |\ \
| | * | | [PATCH] libata basic detection and errata for PATA->SATA bridgesBrad Campbell2005-05-121-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch works around an issue with WD drives (and possibly others) over SiL PATA->SATA Bridges on SATA controllers locking up with transfers > 200 sectors. Signed-off-by: Brad Campbell <brad@wasp.net.au>
| * | | | Automatic merge of /spare/repo/libata-dev branch svw2005-06-041-9/+16
| |\ \ \ \
| | * | | | [PATCH] sata_svw: Add support for new device IDsNarendra Sankar2005-05-251-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BCM5785 (HT1000) is a new southbridge from Serverworks/Broadcom that incorporates 4 SATA ports in a single PCIX function. Functionally these ports are similar to that in older devices like the Apple K2 and the Frodo4/8. This patch adds support for the new PCI device ID along with a blurb on what the various device IDs mean. Additionally in all devices based on this SATA controller, the SATA ports appear as a single PCI function. This is true for older Frodo8 devices as well. Hence the init function should init all the ports present in the detected controller (which could be 4 or 8). Signed-off-by: Narendra Sankar <nsankar@broadcom.com>
| * | | | | Merge of /spare/repo/libata-dev branch pdc206192005-06-041-1/+25
| |\ \ \ \ \
| | * \ \ \ \ Automatic merge of /spare/repo/linux-2.6/.git branch HEAD2005-06-04308-11288/+30413
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | [libata sata_promise] pdc20619 (PATA) supportTobias Lorenz2005-05-121-1/+25
| | | |_|/ / | | |/| | |
| * | | | | Automatic merge of /spare/repo/libata-dev branch ahci-msi2005-06-041-13/+67
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [libata] ahci: minor PCI MSI cleanupJeff Garzik2005-06-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'have_msi' variable with a bit in the existing 'flags' variable,. AHCI_FLAG_MSI.
| | * | | | [libata] ahci: Update for recent ->host_stop() API changeJeff Garzik2005-05-311-4/+4
| | | | | |
| | * | | | Automatic merge of ↵2005-05-3178-4157/+14630
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
| | * \ \ \ \ Automatic merge of ↵2005-05-26206-5995/+12387
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
| | * | | | | | [libata ahci] support PCI MSI interrupt vectorJeff Garzik2005-05-121-10/+63
| | | |_|/ / / | | |/| | | |
* | | | | | | [PATCH] Fix typo in drivers/pci/pci-driver.cMika Kukkonen2005-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git commit 794f5bfa77955c4455f6d72d8b0e2bee25f1ff0c accidentally suffers from a previous typo in that file (',' instead of ';' in end of line). Patch included. Signed-off-by: Mika Kukkonen (mikukkon@iki.fi) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | | Manual merge of ↵Linus Torvalds2005-06-1830-3821/+8998
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git This is a fixed-up version of the broken "upstream-2.6.13" branch, where I re-did the manual merge of drivers/net/r8169.c by hand, and made sure the history is all good.
| * \ \ \ \ \ \ Automatic merge of /spare/repo/netdev-2.6 branch skge2005-06-044-0/+6404
| |\ \ \ \ \ \ \
| | * | | | | | | [PATCH] skge 64bit portabilityAl Viro2005-05-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ptrdiff_t is %td, not %d Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
| | * | | | | | | [PATCH] skge missing includeAl Viro2005-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
| | * | | | | | | [netdrvr] new driver skge, for SysKonnect cardsStephen Hemminger2005-05-124-0/+6403
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch starfire2005-06-042-102/+386
| |\ \ \ \ \ \ \
| | * | | | | | | [netdrvr starfire] Add GPL'd firmware, remove compat codeJeff Garzik2005-05-122-102/+386
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contributed by Ion Badulescu <ionut@badula.org>, further fixed up by me.
| * | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch smc91x2005-06-042-36/+37
| |\ \ \ \ \ \ \
| | * | | | | | | [PATCH] smc91x: more tweaks to help with RX overrunsNicolas Pitre2005-05-271-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@cam.org> Index: linux-2.6/drivers/net/smc91x.c ===================================================================
| | * | | | | | | [PATCH] smc91x: improve diagnostic infoNicolas Pitre2005-05-272-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and remove duplicate status defines. Signed-off-by: Nicolas Pitre <nico@cam.org> Index: linux-2.6/drivers/net/smc91x.c ===================================================================
| | * | | | | | | [PATCH] smc91x warning fixNicolas Pitre2005-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few IO addr type conversions were missing. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | | | | | [PATCH] smc91x addr config checkNicolas Pitre2005-05-121-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PAGE_SIZE mask is indeed confusing. Use the exact mask for this context which has nothing to do with memory pages at all. Also cast to int since the value to compare with is an int. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch remove-drivers2005-06-046-2951/+0
| |\ \ \ \ \ \ \
| | * | | | | | | [PATCH] remove two obsolete net driversAdrian Bunk2005-05-126-2951/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The options FMV18X and SK_G16 do depend on the non-available CONFIG_OBSOLETE even in kernel 2.4 - IOW, the last time it was able to select them was in kernel 2.2 (or even before). Since it seems noone misses these drivers, this patch removes them. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch iff-running2005-06-046-31/+12
| |\ \ \ \ \ \ \
| | * | | | | | | [netdrvrs] Use netif_carrier_* instead of IFF_RUNNING2005-05-126-31/+12
| | |/ / / / / /
| * | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch viro2005-06-042-15/+18
| |\ \ \ \ \ \ \
| | * | | | | | | [PATCH] pcnet_cs cleanupAl Viro2005-05-151-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | killed abuse of ->rmem_end Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
| | * | | | | | | [PATCH] etherh iomem annotationsAl Viro2005-05-151-7/+9
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the usual echo Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
| * | | | | | | Automatic merge of /spare/repo/netdev-2.6 branch r81692005-06-041-70/+273
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Automatic merge of rsync://www.fr.zoreil.com/linux-2.6.git branch HEAD2005-05-271-68/+252
| | |\ \ \ \ \ \ \
| | | * | | | | | | [PATCH] r8169: minor cleanupRichard Dawe2005-05-271-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - more consistent prototypes; - rtl8169_rx_interrupt() o the error condition should be rare; o goto removal. Signed-off-by: Richard Dawe <rich@phekda.gotadsl.co.uk> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | | * | | | | | | [PATCH] r8169: add ethtool support for dumping the chip statisticsStephen Hemminger2005-05-271-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There aren't lots of statistics available, but this is what is available according to the RealTek documentation. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | | * | | | | | | [PATCH] r8169: ethtool message level control supportStephen Hemminger2005-05-271-56/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - ratelimit the too much work at interrupt message, so if under massive packet load the console doesn't get flooded; - removal of a few PFX used in contexts where dev->name is available; - s/->slot_name/pci_name/; - printed_version is redundant with the debug option. Remove it and let the user decide. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | | * | | | | | | [PATCH] r8169: add module parameter (media)Francois Romieu2005-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add module parameter description for the media option. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | | * | | | | | | [PATCH] r8169: add module parameter (copybreak)Stephen Hemminger2005-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add module parameter description for copybreak. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
generated by cgit (git 2.34.1) at 2025-01-12 15:11:18 +0000