diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-03-20 18:10:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-21 23:06:16 +0100 |
| commit | 18ec5c731271939acb414614e964c15c8ef52156 (patch) | |
| tree | e00ad5d5519623aea279da11bac381dd220ce40b | |
| parent | [ARM] 3372/1: ep93xx: add defconfig (diff) | |
| download | linux-18ec5c731271939acb414614e964c15c8ef52156.tar.xz linux-18ec5c731271939acb414614e964c15c8ef52156.zip | |
[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: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/common/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/common/uengine.c (renamed from arch/arm/mach-ixp2000/uengine.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ixp2000/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/ixp2000/enp2611.c | 2 | ||||
| -rw-r--r-- | drivers/net/ixp2000/ixpdev.c | 2 | ||||
| -rw-r--r-- | include/asm-arm/hardware/uengine.h (renamed from include/asm-arm/arch-ixp2000/uengine.h) | 0 |
6 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index c81a2ff6b5be..847e3e6356c6 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -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 diff --git a/arch/arm/mach-ixp2000/uengine.c b/arch/arm/common/uengine.c index ec4e007a22ef..a1310b71004e 100644 --- a/arch/arm/mach-ixp2000/uengine.c +++ b/arch/arm/common/uengine.c @@ -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 diff --git a/arch/arm/mach-ixp2000/Makefile b/arch/arm/mach-ixp2000/Makefile index 9621aeb61f46..1e6139d42a92 100644 --- a/arch/arm/mach-ixp2000/Makefile +++ b/arch/arm/mach-ixp2000/Makefile @@ -1,7 +1,7 @@ # # Makefile for the linux kernel. # -obj-y := core.o pci.o uengine.o +obj-y := core.o pci.o obj-m := obj-n := obj- := diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c index d82651a97bae..6f7dce8eba51 100644 --- a/drivers/net/ixp2000/enp2611.c +++ b/drivers/net/ixp2000/enp2611.c @@ -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" diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index 09f03f493bea..77f104a005f3 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c @@ -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" diff --git a/include/asm-arm/arch-ixp2000/uengine.h b/include/asm-arm/hardware/uengine.h index b442d65c6593..b442d65c6593 100644 --- a/include/asm-arm/arch-ixp2000/uengine.h +++ b/include/asm-arm/hardware/uengine.h |