Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18ec5c73 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3373/1: move uengine loader to arch/arm/common 



Patch from Lennert Buytenhek

Move the uengine loader from arch/arm/mach-ixp2000 to arch/arm/common
so that ixp23xx can use it too.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent dd18c34e

arch/arm/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ obj-$(CONFIG_SHARP_LOCOMO) += locomo.o 
obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o

obj-$(CONFIG_SHARPSL_PM)	+= sharpsl_pm.o

obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o

obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o

arch/arm/mach-ixp2000/uengine.c→arch/arm/common/uengine.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/string.h>

#include <asm/hardware.h>

#include <asm/arch/ixp2000-regs.h>

#include <asm/arch/uengine.h>

#include <asm/hardware/uengine.h>

#include <asm/io.h>



#define USTORE_ADDRESS			0x000

arch/arm/mach-ixp2000/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#

obj-y			:= core.o pci.o uengine.o

obj-y			:= core.o pci.o

obj-m			:=

obj-n			:=

obj-			:=

drivers/net/ixp2000/enp2611.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/etherdevice.h>

#include <linux/init.h>

#include <linux/moduleparam.h>

#include <asm/arch/uengine.h>

#include <asm/hardware/uengine.h>

#include <asm/mach-types.h>

#include <asm/io.h>

#include "ixpdev.h"

drivers/net/ixp2000/ixpdev.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/etherdevice.h>

#include <linux/init.h>

#include <linux/moduleparam.h>

#include <asm/arch/uengine.h>

#include <asm/hardware/uengine.h>

#include <asm/mach-types.h>

#include <asm/io.h>

#include "ixp2400_rx.ucode"