| Message ID | 20140402231303.GB5013@electric-eye.fr.zoreil.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 03 Apr 2014 01:13:03 +0200, Francois Romieu said: > Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> > --- > > Valdis, is it what you had in mind ? Works for me. That brings it in line with other network drivers, feel free to stick this on: Acked-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> > drivers/net/ethernet/samsung/Kconfig | 24 ++++++++++++++++++++---- > drivers/net/ethernet/samsung/sxgbe/Kconfig | 9 --------- > 2 files changed, 20 insertions(+), 13 deletions(-) > delete mode 100644 drivers/net/ethernet/samsung/sxgbe/Kconfig > > diff --git a/drivers/net/ethernet/samsung/Kconfig b/drivers/net/ethernet/sams ung/Kconfig > index 7902341..2360d81 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 Samsu ng > - 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/etherne t/samsung/sxgbe/Kconfig > deleted file mode 100644 > index d79288c..0000000 > --- 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 Samsu ng > - platforms. > -- > 1.9.0 >
From: Francois Romieu <romieu@fr.zoreil.com> Date: Thu, 3 Apr 2014 01:13:03 +0200 > Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/samsung/Kconfig b/drivers/net/ethernet/samsung/Kconfig index 7902341..2360d81 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 d79288c..0000000 --- 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.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> --- Valdis, is it what you had in mind ? drivers/net/ethernet/samsung/Kconfig | 24 ++++++++++++++++++++---- drivers/net/ethernet/samsung/sxgbe/Kconfig | 9 --------- 2 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 drivers/net/ethernet/samsung/sxgbe/Kconfig