summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2007-02-1990-314/+304
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits) Documentation/kernel-docs.txt update. arch/cris: typo in KERN_INFO Storage class should be before const qualifier kernel/printk.c: comment fix update I/O sched Kconfig help texts - CFQ is now default, not AS. Remove duplicate listing of Cris arch from README kbuild: more doc. cleanups doc: make doc. for maxcpus= more visible drivers/net/eexpress.c: remove duplicate comment add a help text for BLK_DEV_GENERIC correct a dead URL in the IP_MULTICAST help text fix the BAYCOM_SER_HDX help text fix SCSI_SCAN_ASYNC help text trivial documentation patch for platform.txt Fix typos concerning hierarchy Fix comment typo "spin_lock_irqrestore". Fix misspellings of "agressive". drivers/scsi/a100u2w.c: trivial typo patch Correct trivial typo in log2.h. Remove useless FIND_FIRST_BIT() macro from cardbus.c. ...
| * Documentation/kernel-docs.txt update.James Nelson2007-02-171-136/+121
| | | | | | | | | | Signed-off-by: James Nelson <james4765@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * arch/cris: typo in KERN_INFONicolas Kaiser2007-02-172-2/+2
| | | | | | | | | | | | | | Typo in KERN_INFO. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Storage class should be before const qualifierTobias Klauser2007-02-1717-28/+28
| | | | | | | | | | | | | | | | | | | | | | The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * kernel/printk.c: comment fixPatrick Pletscher2007-02-171-1/+1
| | | | | | | | | | Signed-off-by: Patrick Pletscher <pat@pletscher.org> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * update I/O sched Kconfig help texts - CFQ is now default, not AS.Jesper Juhl2007-02-171-4/+5
| | | | | | | | | | | | | | | | Change I/O scheduler description to correctly show CFQ as being the default scheduler and not the anticipatory scheduler that previously was default. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Remove duplicate listing of Cris arch from READMEJesper Juhl2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | Mikael Pettersson pointed out to me that a recent patch of mine (commit 620034c84d1d939717bdfbe02c51a3fee43541c3), that made some corrections to the README file, accidentally listed the Cris architecture twice. Whoops. This patch removes the duplicate. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * kbuild: more doc. cleanupsRandy Dunlap2007-02-171-14/+14
| | | | | | | | | | | | | | Fix typos/spellos in kbuild/makefiles.txt. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * doc: make doc. for maxcpus= more visibleRandy Dunlap2007-02-171-1/+8
| | | | | | | | | | | | | | | | | | Some people are confused about maxcpus=1 and maxcpus=0, so put the documentation text from init/main.c into Documentation/kernel-parameters.txt also. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * drivers/net/eexpress.c: remove duplicate commentShane Shrybman2007-02-171-7/+0
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * add a help text for BLK_DEV_GENERICJohn Daiker2007-02-171-0/+3
| | | | | | | | | | | | This fixes kernel Bugzilla #4933. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * correct a dead URL in the IP_MULTICAST help textAdrian Bunk2007-02-171-1/+1
| | | | | | | | | | | | Reported in kernel Bugzilla #6216. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * fix the BAYCOM_SER_HDX help textSimon Depiets2007-02-171-1/+2
| | | | | | | | | | | | This fixes kernel Bugzilla #4076. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * fix SCSI_SCAN_ASYNC help textMatthew Wilcox2007-02-171-2/+3
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * trivial documentation patch for platform.txtErik Hovland2007-02-171-2/+2
| | | | | | | | | | | | | | | | Found a couple of typos in the Documentation/driver-model/platform.txt file. This patch fixes both of them. Signed-off-by: Erik Hovland <erik@hovland.org> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix typos concerning hierarchyUwe Kleine-König2007-02-1711-19/+19
| | | | | | | | | | | | | | | | heirarchical, hierachical -> hierarchical heirarchy, hierachy -> hierarchy Signed-off-by: Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix comment typo "spin_lock_irqrestore".Robert P. J. Day2007-02-171-1/+1
| | | | | | | | | | | | | | Fix "spin_lock_irqrestore" to "spin_unlock_irqrestore." Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Fix misspellings of "agressive".Robert P. J. Day2007-02-174-13/+13
| | | | | | | | | | | | | | | | Fix the various misspellings of "agressive", as well as a couple other things on the same lines while we're there. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * drivers/scsi/a100u2w.c: trivial typo patchRobert P. J. Day2007-02-171-1/+1
| | | | | | | | | | | | | | Trivial typo fix. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Correct trivial typo in log2.h.Robert P. J. Day2007-02-171-1/+1
| | | | | | | | | | | | | | | | Single typo correction in include/linux/log2.h. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Remove useless FIND_FIRST_BIT() macro from cardbus.c.Robert P. J. Day2007-02-171-2/+0
| | | | | | | | | | | | | | Delete the definition of the unused FIND_FIRST_BIT() macro. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Replace remaining references to "driverfs" with "sysfs".Robert P. J. Day2007-02-1723-53/+53
| | | | | | | | | | | | | | Globally, s/driverfs/sysfs/g. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Use ARRAY_SIZE() macro in i386 relocs.c fileRobert P. J. Day2007-02-171-4/+5
| | | | | | | | | | | | | | | | | | Change the explicit code in the relocs.c file to use ARRAY_SIZE() and add a definition of ARRAY_SIZE() since this is a userspace program and wouldn't include kernel.h. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Various typo fixes.Robert P. J. Day2007-02-1712-16/+16
| | | | | | | | | | | | | | | | Correct mis-spellings of "algorithm", "appear", "consistent" and (shame, shame) "kernel". Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * kbuild: Replace remaining "depends" with "depends on"Robert P. J. Day2007-02-173-3/+3
| | | | | | | | | | | | | | | | Replace the very few remaining "depends" Kconfig directives with "depends on". Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * rio: typo in bitwise AND expression.Willy Tarreau2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line : hp->Mode &= !RIO_PCI_INT_ENABLE; is obviously wrong as RIO_PCI_INT_ENABLE=0x04 and is used as a bitmask 2 lines before. Getting no IRQ would not disable RIO_PCI_INT_ENABLE but rather RIO_PCI_BOOT_FROM_RAM which equals 0x01. Obvious fix is to change ! for ~. Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Adrian Bunk <bunk@stusta.de>
* | Merge branch 'kill-jffs' of ↵Linus Torvalds2007-02-1912-6859/+0
|\ \ | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: Remove JFFS (version 1), as scheduled.
| * | Remove JFFS (version 1), as scheduled.Jeff Garzik2007-02-1712-6859/+0
| |/ | | | | | | | | | | Unmaintained for years, few if any users. Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Merge branch 'acpi' of ↵Linus Torvalds2007-02-197-1/+751
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] libata: wrong sizeof for BUFFER [PATCH] libata: change order of _SDD/_GTF execution (resend #3) [PATCH] libata: ACPI _SDD support [PATCH] libata: ACPI and _GTF support
| * | [PATCH] libata: wrong sizeof for BUFFERFiodor Suietov2007-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have reproduced the AE_AML_BUFFER_LIMIT exception mentioned in <http://bugzilla.kernel.org/show_bug.cgi?id=7689> basing on the SSDT ASL code and libata ata_acpi_push_id() code. There is an oversight in ata_acpi_push_id() causing the exception. The following update fixes it: Signed-off-by: Fiodor Suietov <fiodor.f.suietov@intel.com> Cc: Jeff Garzik <jeff@garzik.org> Cc: Tejun Heo <htejun@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] libata: change order of _SDD/_GTF execution (resend #3)Kristen Carlson Accardi2007-02-161-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make the sdd call come before gtf. _SDD is used to provide input to the _GTF file, so it should be executed first. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> (cherry picked from 89d74215e1e5b79ea084385b5c83d0e33cf2d655 commit)
| * | [PATCH] libata: ACPI _SDD supportKristen Carlson Accardi2007-02-163-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _SDD (Set Device Data) is an ACPI method that is used to tell the firmware what the identify data is of the device that is attached to the port. It is an optional method, and it's ok for it to be missing. Because of this, we always return success from the routine that calls this method, even if the execution fails. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> (cherry picked from 39aa79e0a1f5f2e28aa341f035940746a98b45b1 commit)
| * | [PATCH] libata: ACPI and _GTF supportKristen Carlson Accardi2007-02-167-1/+643
| |/ | | | | | | | | | | | | | | | | | | _GTF is an acpi method that is used to reinitialize the drive. It returns a task file containing ata commands that are sent back to the drive to restore it to boot up defaults. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> (cherry picked from 9c69cab24b51a89664f4c0dfaf8a436d32117624 commit)
* | Merge branch 'upstream-linus' of ↵Linus Torvalds2007-02-1957-447/+706
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (51 commits) sk98lin: mark deprecated in Kconfig Hostess SV-11 depends on INET Fix link autonegotiation timer. sk98lin: planned removal B44: increase wait loop b44: replace define e1000: allow ethtool to see link status when down e1000: remove obsolete custom pci_save_state code e1000: fix shared interrupt warning message atm: Use ARRAY_SIZE macro when appropriate bugfixes and new hardware support for arcnet driver pcnet32 NAPI no longer experimental MAINTAINER macb: Remove inappropriate spinlocks around mii calls Convert meth to netdev_priv sky2: v1.13 sky2: receive error handling improvements sky2: transmit timeout sky2: flow control negotiation for Yukon-FE sky2: no need to reset pause bits on shutdown ...
| * | sk98lin: mark deprecated in KconfigDaniel Drake2007-02-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | sk98lin is scheduled for removal in July 2007. This patch makes the deprecation more obvious in the configuration interface. FWIW, Gentoo have been shipping a patch very similar to this for a long time. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | Hostess SV-11 depends on INETBaruch Even2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comtrol Hostess SV-11 driver uses features from INET but doesn't depend on it. The simple solution is to make it depend on INET as happens for the sealevel driver. Fixes bug #7930. Signed-Off-By: Baruch Even <baruch@ev-en.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | Fix link autonegotiation timer.Ralf Baechle2007-02-171-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Start link negotiation in the open method. Previously it was started on driver initialialization and shutdown on close so an ifdown would have results in closing negotiation for good. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | sk98lin: planned removalStephen Hemminger2007-02-171-0/+3
| | | | | | | | | | | | | | | | | | | | | Nag message about planned sk98lin removal. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | B44: increase wait loopGary Zambrano2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The b44 Enet control disable bit may take longer to clear on some systems, so the loop count is increased with this patch. Functionality is not compromised, but a debug message can be seen when the bit is not cleared within the count value. Thanks to Vasileios Lourdas who reported the problem. Signed-off by: Gary Zambrano <zambrano@broadcom.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | b44: replace defineGary Zambrano2007-02-171-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | Replaced B44_DMA_MASK with DMA_30BIT_MASK. Signed-off by: Gary Zambrano <zambrano@broadcom.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | e1000: allow ethtool to see link status when downKok, Auke2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | By reading the MAC status register we can detect whether the MAC has seen the PHY see link. This allows us to show the link properties before the device is up in ethtool. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | e1000: remove obsolete custom pci_save_state codeKok, Auke2007-02-172-57/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that 2.6.19 provides a proper implementation that saves MSI, PCI-E config space, we can have the e1000 driver use those instead of it's custom implementation. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | e1000: fix shared interrupt warning messageKok, Auke2007-02-171-6/+6
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | atm: Use ARRAY_SIZE macro when appropriateAhmed S. Darwish2007-02-173-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ARRAY_SIZE macro already defined in kernel.h for ATM drivers. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Cc: Jeff Garzik <jeff@garzik.org> Cc: chas williams <chas@cmf.nrl.navy.mil> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | bugfixes and new hardware support for arcnet driverJeff Morrow2007-02-174-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modifications and bug fixes noted below were done by Realtime Control Works and Contemporary Control Systems, Inc, Jan 2005. They were incorporated into the 2.6 kernel by Jeff Morrow of Sierra Analytics, Feb 2007. <jmorrow@massspec.com> The changes have been tested on a Contemporary Controls PCI20U-4000. Summary of changes: Arc-rawmode.c: rx(): - Fixed error in received packet lengths; 256 byte packets were being received as 257 bytes packets. prepare_tx(): - Fixed error in transmit length calcs; 257 byte packets were being transmitted as 260 byte packets. com20020.c: com20020_check(): - We now load the SETUP2 register if the 'clockm' parameter is non-zero, instead of checking for ARC_CAN_10MBIT. The user is now responsible for whether or not SETUP2 is loaded. If the clock multiplier is non-zero, this means that the user wants a baud rate greater than 2.5Mbps. This is not possible unless the SETUP2 register is present (COM20020D, or COM20022). So, we're relying on the user to be smart about what kind of chip he's dealing with... com20020-pci.c - Added several entries to com20020pci_id_table[]. Signed-off-by: Jeff Morrow <jmorrow@massspec.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | pcnet32 NAPI no longer experimentalpcnet32@verizon.net2007-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | Remove the experimental tag for the pcnet32 NAPI implementation. Signed-off-by: Don Fry <pcnet32@verizon.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | MAINTAINERpcnet32@verizon.net2007-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | After being the defacto maintainer for a couple of years, I can now become the official maintainer. Signed-off-by: Don Fry <pcnet32@verizon.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | macb: Remove inappropriate spinlocks around mii callsHaavard Skinnemoen2007-02-171-21/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove spin_lock_irqsave() around mii_ethtool_gset, mii_ethtool_sset and generic_mii_ioctl. These are unnecessary and harmful because the mii calls may call back into the mdio functions, which may sleep. Pointed out by David Brownell. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | Convert meth to netdev_privRalf Baechle2007-02-171-13/+13
| | | | | | | | | | | | | | | | | | | | | And while at it loose plenty of useless casts. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | sky2: v1.13Stephen Hemminger2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | New version. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 15:22:11 +0000