summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrançois romieu <romieu@fr.zoreil.com>2014-04-03 01:13:03 +0200
committerDavid S. Miller <davem@davemloft.net>2014-04-03 14:36:27 -0400
commit56c8b193ea7052d191c344ef9196bb8d759e1abf (patch)
treeed0b5ac9bca21f60bc3c33e289e7fe3f777823c4
parentd0290214de712150b118a532ded378a29255893b (diff)
downloadtalos-obmc-linux-56c8b193ea7052d191c344ef9196bb8d759e1abf.tar.gz
talos-obmc-linux-56c8b193ea7052d191c344ef9196bb8d759e1abf.zip
sxgbe: use common NET_VENDOR_FOO style.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Acked-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/samsung/Kconfig24
-rw-r--r--drivers/net/ethernet/samsung/sxgbe/Kconfig9
2 files changed, 20 insertions, 13 deletions
diff --git a/drivers/net/ethernet/samsung/Kconfig b/drivers/net/ethernet/samsung/Kconfig
index 7902341f2623..2360d8150777 100644
--- a/drivers/net/ethernet/samsung/Kconfig
+++ b/drivers/net/ethernet/samsung/Kconfig
@@ -3,14 +3,30 @@
#
config NET_VENDOR_SAMSUNG
- bool "Samsung Ethernet device"
+ bool "Samsung Ethernet devices"
default y
---help---
- This is the driver for the SXGBE 10G Ethernet IP block found on Samsung
- platforms.
+ If you have a network (Ethernet) chipset belonging to this class,
+ 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 about Samsung chipsets. If you say Y, you will be asked
+ for your specific chipset/driver in the following questions.
if NET_VENDOR_SAMSUNG
-source "drivers/net/ethernet/samsung/sxgbe/Kconfig"
+config SXGBE_ETH
+ tristate "Samsung 10G/2.5G/1G SXGBE Ethernet driver"
+ depends on HAS_IOMEM && HAS_DMA
+ select PHYLIB
+ select CRC32
+ select PTP_1588_CLOCK
+ ---help---
+ This is the driver for the SXGBE 10G Ethernet IP block found on
+ Samsung platforms.
+
+ To compile this driver as a module, choose M here: the module
+ will be called samsung-sxgbe.
endif # NET_VENDOR_SAMSUNG
diff --git a/drivers/net/ethernet/samsung/sxgbe/Kconfig b/drivers/net/ethernet/samsung/sxgbe/Kconfig
deleted file mode 100644
index d79288c51d0a..000000000000
--- a/drivers/net/ethernet/samsung/sxgbe/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-config SXGBE_ETH
- tristate "Samsung 10G/2.5G/1G SXGBE Ethernet driver"
- depends on HAS_IOMEM && HAS_DMA
- select PHYLIB
- select CRC32
- select PTP_1588_CLOCK
- ---help---
- This is the driver for the SXGBE 10G Ethernet IP block found on Samsung
- platforms.
OpenPOWER on IntegriCloud