p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'net-Manufacturer-names-and-spelling-fixes' 

Geert Uytterhoeven says:

====================
net: Manufacturer names and spelling fixes

This is a set of fixes for (some blatantly) wrong manufacturer names and
various spelling issues, mostly in Kconfig help texts.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2019-08-01 13:45:49 -04:00
parent 944a83a266 509b0538bc
commit 1860107895
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/8390/Kconfig
View File

@ -12,8 +12,8 @@ config NET_VENDOR_8390
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about Western Digital cards. If you say Y, you will be
asked for your specific card in the following questions.
the questions about National Semiconductor 8390 cards. If you say Y,
you will be asked for your specific card in the following questions.
if NET_VENDOR_8390

2
drivers/net/ethernet/amd/Kconfig
View File

@ -14,7 +14,7 @@ config NET_VENDOR_AMD
say Y.
Note that the answer to this question does not directly affect
the kernel: saying N will just case the configurator to skip all
the kernel: saying N will just cause the configurator to skip all
the questions regarding AMD chipsets. If you say Y, you will be asked
for your specific chipset/driver in the following questions.

4
drivers/net/ethernet/apple/Kconfig
View File

@ -11,8 +11,8 @@ config NET_VENDOR_APPLE
If you have a network (Ethernet) card belonging to this class, say Y.
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about IBM devices. If you say Y, you will be asked for
kernel: saying N will just cause the configurator to skip all the
questions about Apple devices. If you say Y, you will be asked for
your specific card in the following questions.
if NET_VENDOR_APPLE

6
drivers/net/ethernet/broadcom/Kconfig
View File

@ -14,9 +14,9 @@ config NET_VENDOR_BROADCOM
say Y.
Note that the answer to this question does not directly affect
the kernel: saying N will just case the configurator to skip all
the questions regarding AMD chipsets. If you say Y, you will be asked
for your specific chipset/driver in the following questions.
the kernel: saying N will just cause the configurator to skip all
the questions regarding Broadcom chipsets. If you say Y, you will
be asked for your specific chipset/driver in the following questions.
if NET_VENDOR_BROADCOM

2
drivers/net/ethernet/ni/Kconfig
View File

@ -11,7 +11,7 @@ config NET_VENDOR_NI
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about National Instrument devices.
the questions about National Instruments devices.
If you say Y, you will be asked for your specific device in the
following questions.

6
drivers/net/ethernet/packetengines/Kconfig
View File

@ -1,10 +1,10 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# Packet engine device configuration
# Packet Engines device configuration
#
config NET_VENDOR_PACKET_ENGINES
bool "Packet Engine devices"
bool "Packet Engines devices"
default y
depends on PCI
---help---
@ -12,7 +12,7 @@ config NET_VENDOR_PACKET_ENGINES
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about packet engine devices. If you say Y, you will
the questions about Packet Engines devices. If you say Y, you will
be asked for your specific card in the following questions.
if NET_VENDOR_PACKET_ENGINES

2
drivers/net/ethernet/packetengines/Makefile
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# Makefile for the Packet Engine network device drivers.
# Makefile for the Packet Engines network device drivers.
#
obj-$(CONFIG_HAMACHI) += hamachi.o

2
drivers/net/ethernet/samsung/Kconfig
View File

@ -11,7 +11,7 @@ config NET_VENDOR_SAMSUNG
say Y.
Note that the answer to this question does not directly affect
the kernel: saying N will just case the configurator to skip all
the kernel: saying N will just cause the configurator to skip all
the questions about Samsung chipsets. If you say Y, you will be asked
for your specific chipset/driver in the following questions.

2
drivers/net/ethernet/xscale/Kconfig
View File

@ -13,7 +13,7 @@ config NET_VENDOR_XSCALE
Note that the answer to this question does not directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about XSacle IXP devices. If you say Y, you will be
the questions about XScale IXP devices. If you say Y, you will be
asked for your specific card in the following questions.
if NET_VENDOR_XSCALE