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

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
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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.

+2 −2
Original line number Diff line number Diff line
@@ -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
+3 −3
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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.

Loading