diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 13:58:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 13:58:05 -0500 |
| commit | 8b4b6707ee32f929846d947d18b1b9bf42e988aa (patch) | |
| tree | aa27dd01e2d74cb68efc4ab57eb4d1f4e563ae33 /drivers/net | |
| 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/net')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
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 | |||
| 1914 | depends on E1000 | 1914 | depends on E1000 |
| 1915 | help | 1915 | help |
| 1916 | Say Y here if you want to use the legacy receive path for PCI express | 1916 | Say Y here if you want to use the legacy receive path for PCI express |
| 1917 | hadware. | 1917 | hardware. |
| 1918 | 1918 | ||
| 1919 | If in doubt, say N. | 1919 | If in doubt, say N. |
| 1920 | 1920 | ||