diff options
| author | David S. Miller | 2020-10-05 17:33:26 -0700 |
|---|---|---|
| committer | David S. Miller | 2020-10-05 18:40:01 -0700 |
| commit | 8b0308fe319b8002753ea66f8f940fb393792ddd (patch) | |
| tree | 4c5a80346308db8cac9ff0951bb10e892c2387ad /drivers/net/ethernet/aquantia | |
| parent | f4f9dcc3f4c5f576ee195bdf0fd1682da7a3a73a (diff) | |
| parent | 7575fdda569b2a2e8be32c1a64ecb05d6f96a500 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Rejecting non-native endian BTF overlapped with the addition
of support for it.
The rest were more simple overlapping changes, except the
renesas ravb binding update, which had to follow a file
move as well as a YAML conversion.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/Makefile b/drivers/net/ethernet/aquantia/atlantic/Makefile index 130a105d03f3..8ebcc68e807f 100644 --- a/drivers/net/ethernet/aquantia/atlantic/Makefile +++ b/drivers/net/ethernet/aquantia/atlantic/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_AQTION) += atlantic.o -ccflags-y += -I$(src) +ccflags-y += -I$(srctree)/$(src) atlantic-objs := aq_main.o \ aq_nic.o \ @@ -33,4 +33,4 @@ atlantic-objs := aq_main.o \ atlantic-$(CONFIG_MACSEC) += aq_macsec.o -atlantic-$(CONFIG_PTP_1588_CLOCK) += aq_ptp.o
\ No newline at end of file +atlantic-$(CONFIG_PTP_1588_CLOCK) += aq_ptp.o |