summary refs log tree commit diff
path: root/drivers/net
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/net
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/net')
-rw-r--r--drivers/net/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e0b11095b9da..00993e8ba589 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.