diff --git a/Makefile b/Makefile
index e3a27c6249..6718f8d046 100644
--- a/Makefile
+++ b/Makefile
@@ -238,7 +238,7 @@ ifdef SOC
 LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
 endif
 ifeq ($(CPU),ixp)
-LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o
+LIBS-y += drivers/net/npe/libnpe.o
 endif
 LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
 LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
diff --git a/arch/arm/cpu/ixp/npe/IxEthAcc.c b/drivers/net/npe/IxEthAcc.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthAcc.c
rename to drivers/net/npe/IxEthAcc.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthAccCommon.c b/drivers/net/npe/IxEthAccCommon.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthAccCommon.c
rename to drivers/net/npe/IxEthAccCommon.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c b/drivers/net/npe/IxEthAccControlInterface.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthAccControlInterface.c
rename to drivers/net/npe/IxEthAccControlInterface.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c b/drivers/net/npe/IxEthAccDataPlane.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthAccDataPlane.c
rename to drivers/net/npe/IxEthAccDataPlane.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthAccMac.c b/drivers/net/npe/IxEthAccMac.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthAccMac.c
rename to drivers/net/npe/IxEthAccMac.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthAccMii.c b/drivers/net/npe/IxEthAccMii.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthAccMii.c
rename to drivers/net/npe/IxEthAccMii.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBAPI.c b/drivers/net/npe/IxEthDBAPI.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBAPI.c
rename to drivers/net/npe/IxEthDBAPI.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c b/drivers/net/npe/IxEthDBAPISupport.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBAPISupport.c
rename to drivers/net/npe/IxEthDBAPISupport.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBCore.c b/drivers/net/npe/IxEthDBCore.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBCore.c
rename to drivers/net/npe/IxEthDBCore.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBEvents.c b/drivers/net/npe/IxEthDBEvents.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBEvents.c
rename to drivers/net/npe/IxEthDBEvents.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBFeatures.c b/drivers/net/npe/IxEthDBFeatures.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBFeatures.c
rename to drivers/net/npe/IxEthDBFeatures.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBFirewall.c b/drivers/net/npe/IxEthDBFirewall.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBFirewall.c
rename to drivers/net/npe/IxEthDBFirewall.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBHashtable.c b/drivers/net/npe/IxEthDBHashtable.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBHashtable.c
rename to drivers/net/npe/IxEthDBHashtable.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBLearning.c b/drivers/net/npe/IxEthDBLearning.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBLearning.c
rename to drivers/net/npe/IxEthDBLearning.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBMem.c b/drivers/net/npe/IxEthDBMem.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBMem.c
rename to drivers/net/npe/IxEthDBMem.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c b/drivers/net/npe/IxEthDBNPEAdaptor.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBNPEAdaptor.c
rename to drivers/net/npe/IxEthDBNPEAdaptor.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c b/drivers/net/npe/IxEthDBPortUpdate.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBPortUpdate.c
rename to drivers/net/npe/IxEthDBPortUpdate.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBReports.c b/drivers/net/npe/IxEthDBReports.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBReports.c
rename to drivers/net/npe/IxEthDBReports.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBSearch.c b/drivers/net/npe/IxEthDBSearch.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBSearch.c
rename to drivers/net/npe/IxEthDBSearch.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c b/drivers/net/npe/IxEthDBSpanningTree.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBSpanningTree.c
rename to drivers/net/npe/IxEthDBSpanningTree.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBUtil.c b/drivers/net/npe/IxEthDBUtil.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBUtil.c
rename to drivers/net/npe/IxEthDBUtil.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBVlan.c b/drivers/net/npe/IxEthDBVlan.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBVlan.c
rename to drivers/net/npe/IxEthDBVlan.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthDBWiFi.c b/drivers/net/npe/IxEthDBWiFi.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthDBWiFi.c
rename to drivers/net/npe/IxEthDBWiFi.c
diff --git a/arch/arm/cpu/ixp/npe/IxEthMii.c b/drivers/net/npe/IxEthMii.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxEthMii.c
rename to drivers/net/npe/IxEthMii.c
diff --git a/arch/arm/cpu/ixp/npe/IxFeatureCtrl.c b/drivers/net/npe/IxFeatureCtrl.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxFeatureCtrl.c
rename to drivers/net/npe/IxFeatureCtrl.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeDl.c b/drivers/net/npe/IxNpeDl.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeDl.c
rename to drivers/net/npe/IxNpeDl.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c b/drivers/net/npe/IxNpeDlImageMgr.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeDlImageMgr.c
rename to drivers/net/npe/IxNpeDlImageMgr.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c b/drivers/net/npe/IxNpeDlNpeMgr.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeDlNpeMgr.c
rename to drivers/net/npe/IxNpeDlNpeMgr.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c b/drivers/net/npe/IxNpeDlNpeMgrUtils.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeDlNpeMgrUtils.c
rename to drivers/net/npe/IxNpeDlNpeMgrUtils.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeMh.c b/drivers/net/npe/IxNpeMh.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeMh.c
rename to drivers/net/npe/IxNpeMh.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeMhConfig.c b/drivers/net/npe/IxNpeMhConfig.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeMhConfig.c
rename to drivers/net/npe/IxNpeMhConfig.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeMhReceive.c b/drivers/net/npe/IxNpeMhReceive.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeMhReceive.c
rename to drivers/net/npe/IxNpeMhReceive.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeMhSend.c b/drivers/net/npe/IxNpeMhSend.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeMhSend.c
rename to drivers/net/npe/IxNpeMhSend.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c b/drivers/net/npe/IxNpeMhSolicitedCbMgr.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeMhSolicitedCbMgr.c
rename to drivers/net/npe/IxNpeMhSolicitedCbMgr.c
diff --git a/arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c b/drivers/net/npe/IxNpeMhUnsolicitedCbMgr.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxNpeMhUnsolicitedCbMgr.c
rename to drivers/net/npe/IxNpeMhUnsolicitedCbMgr.c
diff --git a/arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c b/drivers/net/npe/IxOsalBufferMgt.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxOsalBufferMgt.c
rename to drivers/net/npe/IxOsalBufferMgt.c
diff --git a/arch/arm/cpu/ixp/npe/IxOsalIoMem.c b/drivers/net/npe/IxOsalIoMem.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxOsalIoMem.c
rename to drivers/net/npe/IxOsalIoMem.c
diff --git a/arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c b/drivers/net/npe/IxOsalOsCacheMMU.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxOsalOsCacheMMU.c
rename to drivers/net/npe/IxOsalOsCacheMMU.c
diff --git a/arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c b/drivers/net/npe/IxOsalOsMsgQ.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxOsalOsMsgQ.c
rename to drivers/net/npe/IxOsalOsMsgQ.c
diff --git a/arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c b/drivers/net/npe/IxOsalOsSemaphore.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxOsalOsSemaphore.c
rename to drivers/net/npe/IxOsalOsSemaphore.c
diff --git a/arch/arm/cpu/ixp/npe/IxOsalOsServices.c b/drivers/net/npe/IxOsalOsServices.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxOsalOsServices.c
rename to drivers/net/npe/IxOsalOsServices.c
diff --git a/arch/arm/cpu/ixp/npe/IxOsalOsThread.c b/drivers/net/npe/IxOsalOsThread.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxOsalOsThread.c
rename to drivers/net/npe/IxOsalOsThread.c
diff --git a/arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c b/drivers/net/npe/IxQMgrAqmIf.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxQMgrAqmIf.c
rename to drivers/net/npe/IxQMgrAqmIf.c
diff --git a/arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c b/drivers/net/npe/IxQMgrDispatcher.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxQMgrDispatcher.c
rename to drivers/net/npe/IxQMgrDispatcher.c
diff --git a/arch/arm/cpu/ixp/npe/IxQMgrInit.c b/drivers/net/npe/IxQMgrInit.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxQMgrInit.c
rename to drivers/net/npe/IxQMgrInit.c
diff --git a/arch/arm/cpu/ixp/npe/IxQMgrQAccess.c b/drivers/net/npe/IxQMgrQAccess.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxQMgrQAccess.c
rename to drivers/net/npe/IxQMgrQAccess.c
diff --git a/arch/arm/cpu/ixp/npe/IxQMgrQCfg.c b/drivers/net/npe/IxQMgrQCfg.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/IxQMgrQCfg.c
rename to drivers/net/npe/IxQMgrQCfg.c
diff --git a/arch/arm/cpu/ixp/npe/Makefile b/drivers/net/npe/Makefile
similarity index 96%
rename from arch/arm/cpu/ixp/npe/Makefile
rename to drivers/net/npe/Makefile
index 14ab3c7a71..d13391bf94 100644
--- a/arch/arm/cpu/ixp/npe/Makefile
+++ b/drivers/net/npe/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB := $(obj)libnpe.o
 
-LOCAL_CFLAGS  += -I$(TOPDIR)/arch/arm/cpu/ixp/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
+LOCAL_CFLAGS  += -I$(TOPDIR)/drivers/net/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
 CFLAGS  += $(LOCAL_CFLAGS)
 CPPFLAGS  += $(LOCAL_CFLAGS) # needed for depend
 HOSTCFLAGS  += $(LOCAL_CFLAGS)
diff --git a/arch/arm/cpu/ixp/npe/include/IxAssert.h b/drivers/net/npe/include/IxAssert.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxAssert.h
rename to drivers/net/npe/include/IxAssert.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxAtmSch.h b/drivers/net/npe/include/IxAtmSch.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxAtmSch.h
rename to drivers/net/npe/include/IxAtmSch.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxAtmTypes.h b/drivers/net/npe/include/IxAtmTypes.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxAtmTypes.h
rename to drivers/net/npe/include/IxAtmTypes.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h b/drivers/net/npe/include/IxAtmdAcc.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxAtmdAcc.h
rename to drivers/net/npe/include/IxAtmdAcc.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h b/drivers/net/npe/include/IxAtmdAccCtrl.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h
rename to drivers/net/npe/include/IxAtmdAccCtrl.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxAtmm.h b/drivers/net/npe/include/IxAtmm.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxAtmm.h
rename to drivers/net/npe/include/IxAtmm.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxDmaAcc.h b/drivers/net/npe/include/IxDmaAcc.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxDmaAcc.h
rename to drivers/net/npe/include/IxDmaAcc.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthAcc.h b/drivers/net/npe/include/IxEthAcc.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthAcc.h
rename to drivers/net/npe/include/IxEthAcc.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h b/drivers/net/npe/include/IxEthAccDataPlane_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthAccDataPlane_p.h
rename to drivers/net/npe/include/IxEthAccDataPlane_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h b/drivers/net/npe/include/IxEthAccMac_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthAccMac_p.h
rename to drivers/net/npe/include/IxEthAccMac_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h b/drivers/net/npe/include/IxEthAccMii_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthAccMii_p.h
rename to drivers/net/npe/include/IxEthAccMii_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h b/drivers/net/npe/include/IxEthAccQueueAssign_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthAccQueueAssign_p.h
rename to drivers/net/npe/include/IxEthAccQueueAssign_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h b/drivers/net/npe/include/IxEthAcc_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthAcc_p.h
rename to drivers/net/npe/include/IxEthAcc_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthDB.h b/drivers/net/npe/include/IxEthDB.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthDB.h
rename to drivers/net/npe/include/IxEthDB.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h b/drivers/net/npe/include/IxEthDBLocks_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthDBLocks_p.h
rename to drivers/net/npe/include/IxEthDBLocks_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h b/drivers/net/npe/include/IxEthDBLog_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthDBLog_p.h
rename to drivers/net/npe/include/IxEthDBLog_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h b/drivers/net/npe/include/IxEthDBMessages_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthDBMessages_p.h
rename to drivers/net/npe/include/IxEthDBMessages_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h b/drivers/net/npe/include/IxEthDBPortDefs.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthDBPortDefs.h
rename to drivers/net/npe/include/IxEthDBPortDefs.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h b/drivers/net/npe/include/IxEthDBQoS.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthDBQoS.h
rename to drivers/net/npe/include/IxEthDBQoS.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthDB_p.h b/drivers/net/npe/include/IxEthDB_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthDB_p.h
rename to drivers/net/npe/include/IxEthDB_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthMii.h b/drivers/net/npe/include/IxEthMii.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthMii.h
rename to drivers/net/npe/include/IxEthMii.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthMii_p.h b/drivers/net/npe/include/IxEthMii_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthMii_p.h
rename to drivers/net/npe/include/IxEthMii_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxEthNpe.h b/drivers/net/npe/include/IxEthNpe.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxEthNpe.h
rename to drivers/net/npe/include/IxEthNpe.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h b/drivers/net/npe/include/IxFeatureCtrl.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxFeatureCtrl.h
rename to drivers/net/npe/include/IxFeatureCtrl.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxHssAcc.h b/drivers/net/npe/include/IxHssAcc.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxHssAcc.h
rename to drivers/net/npe/include/IxHssAcc.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxI2cDrv.h b/drivers/net/npe/include/IxI2cDrv.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxI2cDrv.h
rename to drivers/net/npe/include/IxI2cDrv.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeA.h b/drivers/net/npe/include/IxNpeA.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeA.h
rename to drivers/net/npe/include/IxNpeA.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeDl.h b/drivers/net/npe/include/IxNpeDl.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeDl.h
rename to drivers/net/npe/include/IxNpeDl.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h b/drivers/net/npe/include/IxNpeDlImageMgr_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeDlImageMgr_p.h
rename to drivers/net/npe/include/IxNpeDlImageMgr_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h b/drivers/net/npe/include/IxNpeDlMacros_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeDlMacros_p.h
rename to drivers/net/npe/include/IxNpeDlMacros_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h b/drivers/net/npe/include/IxNpeDlNpeMgrEcRegisters_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrEcRegisters_p.h
rename to drivers/net/npe/include/IxNpeDlNpeMgrEcRegisters_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h b/drivers/net/npe/include/IxNpeDlNpeMgrUtils_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgrUtils_p.h
rename to drivers/net/npe/include/IxNpeDlNpeMgrUtils_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h b/drivers/net/npe/include/IxNpeDlNpeMgr_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h
rename to drivers/net/npe/include/IxNpeDlNpeMgr_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeMh.h b/drivers/net/npe/include/IxNpeMh.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeMh.h
rename to drivers/net/npe/include/IxNpeMh.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h b/drivers/net/npe/include/IxNpeMhConfig_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeMhConfig_p.h
rename to drivers/net/npe/include/IxNpeMhConfig_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h b/drivers/net/npe/include/IxNpeMhMacros_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeMhMacros_p.h
rename to drivers/net/npe/include/IxNpeMhMacros_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h b/drivers/net/npe/include/IxNpeMhReceive_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeMhReceive_p.h
rename to drivers/net/npe/include/IxNpeMhReceive_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h b/drivers/net/npe/include/IxNpeMhSend_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeMhSend_p.h
rename to drivers/net/npe/include/IxNpeMhSend_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h b/drivers/net/npe/include/IxNpeMhSolicitedCbMgr_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeMhSolicitedCbMgr_p.h
rename to drivers/net/npe/include/IxNpeMhSolicitedCbMgr_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h b/drivers/net/npe/include/IxNpeMhUnsolicitedCbMgr_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeMhUnsolicitedCbMgr_p.h
rename to drivers/net/npe/include/IxNpeMhUnsolicitedCbMgr_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h b/drivers/net/npe/include/IxNpeMicrocode.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxNpeMicrocode.h
rename to drivers/net/npe/include/IxNpeMicrocode.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsBufLib.h b/drivers/net/npe/include/IxOsBufLib.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsBufLib.h
rename to drivers/net/npe/include/IxOsBufLib.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h b/drivers/net/npe/include/IxOsBuffMgt.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsBuffMgt.h
rename to drivers/net/npe/include/IxOsBuffMgt.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h b/drivers/net/npe/include/IxOsBuffPoolMgt.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsBuffPoolMgt.h
rename to drivers/net/npe/include/IxOsBuffPoolMgt.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h b/drivers/net/npe/include/IxOsCacheMMU.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsCacheMMU.h
rename to drivers/net/npe/include/IxOsCacheMMU.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsPrintf.h b/drivers/net/npe/include/IxOsPrintf.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsPrintf.h
rename to drivers/net/npe/include/IxOsPrintf.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsServices.h b/drivers/net/npe/include/IxOsServices.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsServices.h
rename to drivers/net/npe/include/IxOsServices.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h b/drivers/net/npe/include/IxOsServicesComponents.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsServicesComponents.h
rename to drivers/net/npe/include/IxOsServicesComponents.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h b/drivers/net/npe/include/IxOsServicesEndianess.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsServicesEndianess.h
rename to drivers/net/npe/include/IxOsServicesEndianess.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h b/drivers/net/npe/include/IxOsServicesMemAccess.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsServicesMemAccess.h
rename to drivers/net/npe/include/IxOsServicesMemAccess.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h b/drivers/net/npe/include/IxOsServicesMemMap.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsServicesMemMap.h
rename to drivers/net/npe/include/IxOsServicesMemMap.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsal.h b/drivers/net/npe/include/IxOsal.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsal.h
rename to drivers/net/npe/include/IxOsal.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalAssert.h b/drivers/net/npe/include/IxOsalAssert.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalAssert.h
rename to drivers/net/npe/include/IxOsalAssert.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBackward.h b/drivers/net/npe/include/IxOsalBackward.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBackward.h
rename to drivers/net/npe/include/IxOsalBackward.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h b/drivers/net/npe/include/IxOsalBackwardAssert.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBackwardAssert.h
rename to drivers/net/npe/include/IxOsalBackwardAssert.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h b/drivers/net/npe/include/IxOsalBackwardBufferMgt.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBackwardBufferMgt.h
rename to drivers/net/npe/include/IxOsalBackwardBufferMgt.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h b/drivers/net/npe/include/IxOsalBackwardCacheMMU.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBackwardCacheMMU.h
rename to drivers/net/npe/include/IxOsalBackwardCacheMMU.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h b/drivers/net/npe/include/IxOsalBackwardMemMap.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBackwardMemMap.h
rename to drivers/net/npe/include/IxOsalBackwardMemMap.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h b/drivers/net/npe/include/IxOsalBackwardOsServices.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBackwardOsServices.h
rename to drivers/net/npe/include/IxOsalBackwardOsServices.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h b/drivers/net/npe/include/IxOsalBackwardOssl.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBackwardOssl.h
rename to drivers/net/npe/include/IxOsalBackwardOssl.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h b/drivers/net/npe/include/IxOsalBufferMgt.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBufferMgt.h
rename to drivers/net/npe/include/IxOsalBufferMgt.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h b/drivers/net/npe/include/IxOsalBufferMgtDefault.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalBufferMgtDefault.h
rename to drivers/net/npe/include/IxOsalBufferMgtDefault.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalConfig.h b/drivers/net/npe/include/IxOsalConfig.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalConfig.h
rename to drivers/net/npe/include/IxOsalConfig.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h b/drivers/net/npe/include/IxOsalEndianess.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalEndianess.h
rename to drivers/net/npe/include/IxOsalEndianess.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h b/drivers/net/npe/include/IxOsalIoMem.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalIoMem.h
rename to drivers/net/npe/include/IxOsalIoMem.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h b/drivers/net/npe/include/IxOsalMemAccess.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalMemAccess.h
rename to drivers/net/npe/include/IxOsalMemAccess.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalOem.h b/drivers/net/npe/include/IxOsalOem.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalOem.h
rename to drivers/net/npe/include/IxOsalOem.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalOs.h b/drivers/net/npe/include/IxOsalOs.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalOs.h
rename to drivers/net/npe/include/IxOsalOs.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h b/drivers/net/npe/include/IxOsalOsAssert.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalOsAssert.h
rename to drivers/net/npe/include/IxOsalOsAssert.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h b/drivers/net/npe/include/IxOsalOsBufferMgt.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalOsBufferMgt.h
rename to drivers/net/npe/include/IxOsalOsBufferMgt.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h b/drivers/net/npe/include/IxOsalOsIxp400.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400.h
rename to drivers/net/npe/include/IxOsalOsIxp400.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h b/drivers/net/npe/include/IxOsalOsIxp400CustomizedMapping.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalOsIxp400CustomizedMapping.h
rename to drivers/net/npe/include/IxOsalOsIxp400CustomizedMapping.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h b/drivers/net/npe/include/IxOsalOsTypes.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalOsTypes.h
rename to drivers/net/npe/include/IxOsalOsTypes.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h b/drivers/net/npe/include/IxOsalOsUtilitySymbols.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalOsUtilitySymbols.h
rename to drivers/net/npe/include/IxOsalOsUtilitySymbols.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalTypes.h b/drivers/net/npe/include/IxOsalTypes.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalTypes.h
rename to drivers/net/npe/include/IxOsalTypes.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h b/drivers/net/npe/include/IxOsalUtilitySymbols.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxOsalUtilitySymbols.h
rename to drivers/net/npe/include/IxOsalUtilitySymbols.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxParityENAcc.h b/drivers/net/npe/include/IxParityENAcc.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxParityENAcc.h
rename to drivers/net/npe/include/IxParityENAcc.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h b/drivers/net/npe/include/IxPerfProfAcc.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxPerfProfAcc.h
rename to drivers/net/npe/include/IxPerfProfAcc.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxQMgr.h b/drivers/net/npe/include/IxQMgr.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxQMgr.h
rename to drivers/net/npe/include/IxQMgr.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h b/drivers/net/npe/include/IxQMgrAqmIf_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxQMgrAqmIf_p.h
rename to drivers/net/npe/include/IxQMgrAqmIf_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h b/drivers/net/npe/include/IxQMgrDefines_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxQMgrDefines_p.h
rename to drivers/net/npe/include/IxQMgrDefines_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h b/drivers/net/npe/include/IxQMgrDispatcher_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxQMgrDispatcher_p.h
rename to drivers/net/npe/include/IxQMgrDispatcher_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h b/drivers/net/npe/include/IxQMgrLog_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxQMgrLog_p.h
rename to drivers/net/npe/include/IxQMgrLog_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h b/drivers/net/npe/include/IxQMgrQAccess_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxQMgrQAccess_p.h
rename to drivers/net/npe/include/IxQMgrQAccess_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h b/drivers/net/npe/include/IxQMgrQCfg_p.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxQMgrQCfg_p.h
rename to drivers/net/npe/include/IxQMgrQCfg_p.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h b/drivers/net/npe/include/IxQueueAssignments.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxQueueAssignments.h
rename to drivers/net/npe/include/IxQueueAssignments.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxSspAcc.h b/drivers/net/npe/include/IxSspAcc.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxSspAcc.h
rename to drivers/net/npe/include/IxSspAcc.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h b/drivers/net/npe/include/IxTimeSyncAcc.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxTimeSyncAcc.h
rename to drivers/net/npe/include/IxTimeSyncAcc.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h b/drivers/net/npe/include/IxTimerCtrl.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxTimerCtrl.h
rename to drivers/net/npe/include/IxTimerCtrl.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxTypes.h b/drivers/net/npe/include/IxTypes.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxTypes.h
rename to drivers/net/npe/include/IxTypes.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxUART.h b/drivers/net/npe/include/IxUART.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxUART.h
rename to drivers/net/npe/include/IxUART.h
diff --git a/arch/arm/cpu/ixp/npe/include/IxVersionId.h b/drivers/net/npe/include/IxVersionId.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/IxVersionId.h
rename to drivers/net/npe/include/IxVersionId.h
diff --git a/arch/arm/cpu/ixp/npe/include/ix_error.h b/drivers/net/npe/include/ix_error.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/ix_error.h
rename to drivers/net/npe/include/ix_error.h
diff --git a/arch/arm/cpu/ixp/npe/include/ix_macros.h b/drivers/net/npe/include/ix_macros.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/ix_macros.h
rename to drivers/net/npe/include/ix_macros.h
diff --git a/arch/arm/cpu/ixp/npe/include/ix_os_type.h b/drivers/net/npe/include/ix_os_type.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/ix_os_type.h
rename to drivers/net/npe/include/ix_os_type.h
diff --git a/arch/arm/cpu/ixp/npe/include/ix_ossl.h b/drivers/net/npe/include/ix_ossl.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/ix_ossl.h
rename to drivers/net/npe/include/ix_ossl.h
diff --git a/arch/arm/cpu/ixp/npe/include/ix_symbols.h b/drivers/net/npe/include/ix_symbols.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/ix_symbols.h
rename to drivers/net/npe/include/ix_symbols.h
diff --git a/arch/arm/cpu/ixp/npe/include/ix_types.h b/drivers/net/npe/include/ix_types.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/ix_types.h
rename to drivers/net/npe/include/ix_types.h
diff --git a/arch/arm/cpu/ixp/npe/include/npe.h b/drivers/net/npe/include/npe.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/npe.h
rename to drivers/net/npe/include/npe.h
diff --git a/arch/arm/cpu/ixp/npe/include/os_datatypes.h b/drivers/net/npe/include/os_datatypes.h
similarity index 100%
rename from arch/arm/cpu/ixp/npe/include/os_datatypes.h
rename to drivers/net/npe/include/os_datatypes.h
diff --git a/arch/arm/cpu/ixp/npe/miiphy.c b/drivers/net/npe/miiphy.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/miiphy.c
rename to drivers/net/npe/miiphy.c
diff --git a/arch/arm/cpu/ixp/npe/npe.c b/drivers/net/npe/npe.c
similarity index 100%
rename from arch/arm/cpu/ixp/npe/npe.c
rename to drivers/net/npe/npe.c