diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 10:58:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 10:58:05 -0800 |
| commit | 8b4b6707ee32f929846d947d18b1b9bf42e988aa (patch) | |
| tree | aa27dd01e2d74cb68efc4ab57eb4d1f4e563ae33 /drivers | |
| parent | d04ef3a795b3b7b376a02713ed5e211e9ae1f917 (diff) | |
| parent | 116f232b3794a8b6ebde21aef5004b18cc1cfa86 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
fixed path to moved file in include/linux/device.h
Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description
Documentation/dvb/get_dvb_firmware: fix firmware URL
Documentation: Update to BUG-HUNTING
Remove superfluous NOTIFY_COOKIE_LEN define
add "tags" to .gitignore
Fix "frist", "fisrt", typos
fix rwlock usage example
It's UTF-8
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/platform.c | 2 | ||||
| -rw-r--r-- | drivers/block/cciss.c | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/s390/net/claw.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 89b26832132..83f5c5984d1 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -326,7 +326,7 @@ EXPORT_SYMBOL_GPL(platform_device_register); * platform_device_unregister - unregister a platform-level device * @pdev: platform device we're unregistering * - * Unregistration is done in 2 steps. Fisrt we release all resources + * Unregistration is done in 2 steps. First we release all resources * and remove it from the subsystem, then we drop reference count by * calling platform_device_put(). */ diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index b9c786ee6fa..cf39cf9aac2 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -2137,7 +2137,7 @@ static void start_io( ctlr_info_t *h) break; } - /* Get the frist entry from the Request Q */ + /* Get the first entry from the Request Q */ removeQ(&(h->reqQ), c); h->Qdepth--; diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e0b11095b9d..00993e8ba58 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1914,7 +1914,7 @@ config E1000_DISABLE_PACKET_SPLIT depends on E1000 help Say Y here if you want to use the legacy receive path for PCI express - hadware. + hardware. If in doubt, say N. diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index a86436a7a60..acd2a3f005f 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c @@ -1404,7 +1404,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first, if ( privptr-> p_read_active_first ==NULL ) { #ifdef DEBUGMSG - printk(KERN_INFO "%s:%s p_read_active_frist == NULL \n", + printk(KERN_INFO "%s:%s p_read_active_first == NULL \n", dev->name,__FUNCTION__); printk(KERN_INFO "%s:%s Read active first/last changed \n", dev->name,__FUNCTION__); diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 38ede24b22a..39729460b00 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c @@ -902,7 +902,7 @@ static int megasas_reset_bus_host(struct scsi_cmnd *scmd) int ret; /* - * Frist wait for all commands to complete + * First wait for all commands to complete */ ret = megasas_generic_reset(scmd); |