diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-26 16:37:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-26 16:37:08 -0400 |
| commit | b05930f5d1c7d5873cb050261d21789a99de9d48 (patch) | |
| tree | 2d374846712b0bdacc5dd0a36b3c2f754886e560 /drivers/net/ethernet/realtek/r8169.c | |
| parent | b65f63ee845136940db985f3072335d8cdb6fd6c (diff) | |
| parent | 41a00f7950a6bc0aa956f6d6b423f0fbf34d431a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
include/linux/inetdevice.h
The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.
The iwlwifi conflict is a context overlap.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek/r8169.c')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index c0c9e145fd3b..6f87f2cde647 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
| @@ -7089,7 +7089,7 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 7089 | 7089 | ||
| 7090 | RTL_W8(Cfg9346, Cfg9346_Unlock); | 7090 | RTL_W8(Cfg9346, Cfg9346_Unlock); |
| 7091 | RTL_W8(Config1, RTL_R8(Config1) | PMEnable); | 7091 | RTL_W8(Config1, RTL_R8(Config1) | PMEnable); |
| 7092 | RTL_W8(Config5, RTL_R8(Config5) & PMEStatus); | 7092 | RTL_W8(Config5, RTL_R8(Config5) & (BWF | MWF | UWF | LanWake | PMEStatus)); |
| 7093 | if ((RTL_R8(Config3) & (LinkUp | MagicPacket)) != 0) | 7093 | if ((RTL_R8(Config3) & (LinkUp | MagicPacket)) != 0) |
| 7094 | tp->features |= RTL_FEATURE_WOL; | 7094 | tp->features |= RTL_FEATURE_WOL; |
| 7095 | if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0) | 7095 | if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0) |