1 files changed, 16 insertions, 35 deletions

diff --git a/drivers/net/ethernet/cavium/liquidio/Makefile b/drivers/net/ethernet/cavium/liquidio/Makefile
index e3fc4645cd8a..bc9937502043 100644
--- a/drivers/net/ethernet/cavium/liquidio/Makefile
+++ b/drivers/net/ethernet/cavium/liquidio/Makefile
@@ -2,42 +2,23 @@
 #
 # Cavium Liquidio ethernet device driver
 #
-obj-$(CONFIG_LIQUIDIO) += liquidio.o
 
-liquidio-$(CONFIG_LIQUIDIO) += lio_ethtool.o \
-                        lio_core.o         \
-                        request_manager.o  \
-                        response_manager.o \
-                        octeon_device.o    \
-                        cn66xx_device.o    \
-                        cn68xx_device.o    \
-                        cn23xx_pf_device.o \
-                        cn23xx_vf_device.o \
-                        octeon_mailbox.o   \
-                        octeon_mem_ops.o   \
-                        octeon_droq.o      \
-                        octeon_nic.o
+common-objs :=  lio_ethtool.o           \
+                lio_core.o              \
+                request_manager.o       \
+                response_manager.o      \
+                octeon_device.o         \
+                cn66xx_device.o         \
+                cn68xx_device.o         \
+                cn23xx_pf_device.o      \
+                cn23xx_vf_device.o      \
+                octeon_mailbox.o        \
+                octeon_mem_ops.o        \
+                octeon_droq.o           \
+                octeon_nic.o
 
-liquidio-objs := lio_main.o octeon_console.o lio_vf_rep.o $(liquidio-y)
+obj-$(CONFIG_LIQUIDIO) += liquidio.o
+liquidio-y := lio_main.o octeon_console.o lio_vf_rep.o $(common-objs)
 
 obj-$(CONFIG_LIQUIDIO_VF) += liquidio_vf.o
-
-ifeq ($(CONFIG_LIQUIDIO)$(CONFIG_LIQUIDIO_VF), yy)
-        liquidio_vf-objs := lio_vf_main.o
-else
-liquidio_vf-$(CONFIG_LIQUIDIO_VF) += lio_ethtool.o \
-                        lio_core.o         \
-                        request_manager.o  \
-                        response_manager.o \
-                        octeon_device.o    \
-                        cn66xx_device.o    \
-                        cn68xx_device.o    \
-                        cn23xx_pf_device.o \
-                        cn23xx_vf_device.o \
-                        octeon_mailbox.o   \
-                        octeon_mem_ops.o   \
-                        octeon_droq.o      \
-                        octeon_nic.o
-
-liquidio_vf-objs := lio_vf_main.o $(liquidio_vf-y)
-endif
+liquidio_vf-y := lio_vf_main.o $(common-objs)