From fdd91faef9148fd5a52467a91f79934ee4e7f2bd Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 11 Nov 2013 14:35:59 +0900
Subject: [PATCH] drivers/net/npe: descend only when CONFIG_IXP4XX_NPE=y

CONFIG_IXP4XX_NPE is defined only for CPU ixp.
It is not necessary to filter by CPU ixp.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
 Makefile                 | 4 +---
 drivers/net/npe/Makefile | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5cdfc6dfea..4724f4171c 100644
--- a/Makefile
+++ b/Makefile
@@ -242,9 +242,7 @@ LIBS-y += $(CPUDIR)/lib$(CPU).o
 ifdef SOC
 LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
 endif
-ifeq ($(CPU),ixp)
-LIBS-y += drivers/net/npe/libnpe.o
-endif
+LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/libnpe.o
 LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
 LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
 LIBS-y += fs/libfs.o \
diff --git a/drivers/net/npe/Makefile b/drivers/net/npe/Makefile
index 7fa5ea635f..e36c0bbd69 100644
--- a/drivers/net/npe/Makefile
+++ b/drivers/net/npe/Makefile
@@ -10,7 +10,7 @@ CFLAGS  += $(LOCAL_CFLAGS)
 CPPFLAGS  += $(LOCAL_CFLAGS) # needed for depend
 HOSTCFLAGS  += $(LOCAL_CFLAGS)
 
-obj-$(CONFIG_IXP4XX_NPE) := npe.o \
+obj-y := npe.o \
 	miiphy.o \
 	IxOsalBufferMgt.o \
 	IxOsalIoMem.o \
-- 
2.39.5