Commit 18601078 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 944a83a2 509b0538
...@@ -12,8 +12,8 @@ config NET_VENDOR_8390 ...@@ -12,8 +12,8 @@ config NET_VENDOR_8390
Note that the answer to this question doesn't directly affect the Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all kernel: saying N will just cause the configurator to skip all
the questions about Western Digital cards. If you say Y, you will be the questions about National Semiconductor 8390 cards. If you say Y,
asked for your specific card in the following questions. you will be asked for your specific card in the following questions.
if NET_VENDOR_8390 if NET_VENDOR_8390
......
...@@ -14,7 +14,7 @@ config NET_VENDOR_AMD ...@@ -14,7 +14,7 @@ config NET_VENDOR_AMD
say Y. say Y.
Note that the answer to this question does not directly affect 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 the questions regarding AMD chipsets. If you say Y, you will be asked
for your specific chipset/driver in the following questions. for your specific chipset/driver in the following questions.
......
...@@ -11,8 +11,8 @@ config NET_VENDOR_APPLE ...@@ -11,8 +11,8 @@ config NET_VENDOR_APPLE
If you have a network (Ethernet) card belonging to this class, say Y. 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 Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all kernel: saying N will just cause the configurator to skip all the
the questions about IBM devices. If you say Y, you will be asked for questions about Apple devices. If you say Y, you will be asked for
your specific card in the following questions. your specific card in the following questions.
if NET_VENDOR_APPLE if NET_VENDOR_APPLE
......
...@@ -14,9 +14,9 @@ config NET_VENDOR_BROADCOM ...@@ -14,9 +14,9 @@ config NET_VENDOR_BROADCOM
say Y. say Y.
Note that the answer to this question does not directly affect 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 the questions regarding Broadcom chipsets. If you say Y, you will
for your specific chipset/driver in the following questions. be asked for your specific chipset/driver in the following questions.
if NET_VENDOR_BROADCOM if NET_VENDOR_BROADCOM
......
...@@ -11,7 +11,7 @@ config NET_VENDOR_NI ...@@ -11,7 +11,7 @@ config NET_VENDOR_NI
Note that the answer to this question doesn't directly affect the Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all 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 If you say Y, you will be asked for your specific device in the
following questions. following questions.
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
# #
# Packet engine device configuration # Packet Engines device configuration
# #
config NET_VENDOR_PACKET_ENGINES config NET_VENDOR_PACKET_ENGINES
bool "Packet Engine devices" bool "Packet Engines devices"
default y default y
depends on PCI depends on PCI
---help--- ---help---
...@@ -12,7 +12,7 @@ config NET_VENDOR_PACKET_ENGINES ...@@ -12,7 +12,7 @@ config NET_VENDOR_PACKET_ENGINES
Note that the answer to this question doesn't directly affect the Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all 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. be asked for your specific card in the following questions.
if NET_VENDOR_PACKET_ENGINES if NET_VENDOR_PACKET_ENGINES
......
# SPDX-License-Identifier: GPL-2.0-only # 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 obj-$(CONFIG_HAMACHI) += hamachi.o
......
...@@ -11,7 +11,7 @@ config NET_VENDOR_SAMSUNG ...@@ -11,7 +11,7 @@ config NET_VENDOR_SAMSUNG
say Y. say Y.
Note that the answer to this question does not directly affect 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 the questions about Samsung chipsets. If you say Y, you will be asked
for your specific chipset/driver in the following questions. for your specific chipset/driver in the following questions.
......
...@@ -13,7 +13,7 @@ config NET_VENDOR_XSCALE ...@@ -13,7 +13,7 @@ config NET_VENDOR_XSCALE
Note that the answer to this question does not directly affect the Note that the answer to this question does not directly affect the
kernel: saying N will just cause the configurator to skip all 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. asked for your specific card in the following questions.
if NET_VENDOR_XSCALE if NET_VENDOR_XSCALE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment