diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
commit | d25f27034e1e3ca1f86c3e748ce0f565f13bff7f (patch) | |
tree | 9914ad9ce84d779ee83326d109ebed034523ea5e /drivers/net | |
parent | 56db5e2dc402ec8dd7ba922ec5ae1b450ed95d43 (diff) | |
parent | 82685ba23c803d10f678f25e92ca62aa575d24d9 (diff) |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
reverted to current driver supporting ACM rather than CSI2
drivers/media/video/videobuf2-dma-nvmap.c
drivers/video/tegra/host/Makefile
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 27 | ||||
-rw-r--r-- | drivers/net/r8169.c | 4 |
2 files changed, 22 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 41b279abbd5c..1c3fac524474 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2237,18 +2237,27 @@ config R8169 To compile this driver as a module, choose M here: the module will be called r8169. This is recommended. -config SB1250_MAC - tristate "SB1250 Gigabit Ethernet support" - depends on SIBYTE_SB1xxx_SOC - select PHYLIB +config R8169 + tristate "Realtek 8169 gigabit ethernet support" + depends on PCI + select CRC32 + select MII ---help--- - This driver supports Gigabit Ethernet interfaces based on the - Broadcom SiByte family of System-On-a-Chip parts. They include - the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455 - and BCM1480 chips. + Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter. To compile this driver as a module, choose M here: the module - will be called sb1250-mac. + will be called r8169. This is recommended. + +config R8169_FW_LOAD + bool "Load firmware for Realtek 8169" + depends on R8169 + select FW_LOADER + default y + ---help--- + This enables runtime loading of optional firmware by the Realtek 8169 + driver. Some environments do not require firmware, or prefer not to delay + the boot process when firmware is not available. Say N here to disable + firmware loading. If unsure, say Y. config SIS190 tristate "SiS190/SiS191 gigabit ethernet support" diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 6d657cabb951..a7ff1005ea64 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1327,7 +1327,11 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) static const char *rtl_lookup_firmware_name(struct rtl8169_private *tp) { +#ifdef CONFIG_R8169_FW_LOAD return rtl_chip_infos[tp->mac_version].fw_name; +#else + return NULL; +#endif } static void rtl8169_get_drvinfo(struct net_device *dev, |