summary refs log tree commit diff
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:58:05 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:58:05 -0800
commit8b4b6707ee32f929846d947d18b1b9bf42e988aa (patch)
treeaa27dd01e2d74cb68efc4ab57eb4d1f4e563ae33 /drivers/block
parentd04ef3a795b3b7b376a02713ed5e211e9ae1f917 (diff)
parent116f232b3794a8b6ebde21aef5004b18cc1cfa86 (diff)
downloadlinux-8b4b6707ee32f929846d947d18b1b9bf42e988aa.tar.gz
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/block')
-rw-r--r--drivers/block/cciss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index b9c786ee6fad..cf39cf9aac25 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--;