diff options
| author | David S. Miller | 2013-01-15 21:05:59 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-01-15 21:05:59 +0100 |
| commit | 4b87f922598acf91eee18f71688a33f54f57bcde (patch) | |
| tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/net/ethernet/adi | |
| parent | drivers/net: delete orphaned MCA ibmlana driver content (diff) | |
| parent | tg3: Fix crc errors on jumbo frame receive (diff) | |
| download | kernel-qcow2-linux-4b87f922598acf91eee18f71688a33f54f57bcde.tar.gz kernel-qcow2-linux-4b87f922598acf91eee18f71688a33f54f57bcde.tar.xz kernel-qcow2-linux-4b87f922598acf91eee18f71688a33f54f57bcde.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/adi')
| -rw-r--r-- | drivers/net/ethernet/adi/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig index e49c0eff040b..a9481606bbcd 100644 --- a/drivers/net/ethernet/adi/Kconfig +++ b/drivers/net/ethernet/adi/Kconfig @@ -61,6 +61,7 @@ config BFIN_RX_DESC_NUM config BFIN_MAC_USE_HWSTAMP bool "Use IEEE 1588 hwstamp" + depends on BFIN_MAC && BF518 select PTP_1588_CLOCK default y ---help--- |