diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2011-10-07 09:28:29 +0200 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-10-08 15:03:00 +0200 |
| commit | 654a60e0b4ae8a89f96513d2f02b136e1a6bc509 (patch) | |
| tree | a78df789ca472e1acb67e466208de04492f2a165 /arch/arm/mach-pxa | |
| parent | ARM: pxa: allow selecting just one of TREO680/CENTRO (diff) | |
| download | linux-654a60e0b4ae8a89f96513d2f02b136e1a6bc509.tar.xz linux-654a60e0b4ae8a89f96513d2f02b136e1a6bc509.zip | |
ARM: pxa: pxa95x/saarb depends on pxa3xx code
saarb uses pxa3xx_map_io and pxa3xx_handle_irq, which are part
of the pxa3xx code. This makes sure the necessary header and
implementation is used when building the board file.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa95x.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/saarb.c | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index cc39d17b2e07..be0f7df8685c 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -19,7 +19,7 @@ endif obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa25x.o obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o clock-pxa2xx.o pxa2xx.o pxa27x.o obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o -obj-$(CONFIG_PXA95x) += mfp-pxa3xx.o clock-pxa3xx.o pxa95x.o smemc.o +obj-$(CONFIG_PXA95x) += mfp-pxa3xx.o clock-pxa3xx.o pxa3xx.o pxa95x.o smemc.o obj-$(CONFIG_CPU_PXA300) += pxa300.o obj-$(CONFIG_CPU_PXA320) += pxa320.o obj-$(CONFIG_CPU_PXA930) += pxa930.o diff --git a/arch/arm/mach-pxa/include/mach/pxa95x.h b/arch/arm/mach-pxa/include/mach/pxa95x.h new file mode 100644 index 000000000000..cbb097c4cb1f --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa95x.h @@ -0,0 +1,7 @@ +#ifndef __MACH_PXA95X_H +#define __MACH_PXA95X_H + +#include <mach/pxa3xx.h> +#include <mach/mfp-pxa930.h> + +#endif /* __MACH_PXA95X_H */ diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c index ebd6379c4969..aebd5d9243c3 100644 --- a/arch/arm/mach-pxa/saarb.c +++ b/arch/arm/mach-pxa/saarb.c @@ -21,9 +21,8 @@ #include <mach/irqs.h> #include <mach/hardware.h> -#include <mach/mfp.h> -#include <mach/mfp-pxa930.h> #include <mach/gpio.h> +#include <mach/pxa95x.h> #include "generic.h" |