diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:25:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:25:36 -0400 |
| commit | f906fb1d70e016726fccfb0d978c5d425503db9d (patch) | |
| tree | b2bac5fbe7d2eb81dd7fe6cc88e27dddd0189c84 /arch/arm/mach-ixp4xx/Makefile | |
| parent | 510597e26e2a072e2d46ea5bc57feaf385e37f70 (diff) | |
| parent | a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf (diff) | |
Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc
* 'next/board' of git://git.linaro.org/people/arnd/arm-soc: (34 commits)
ep93xx: add support Vision EP9307 SoM
ARM: mxs: Add initial support for DENX MX28
ARM: EXYNOS4: Add support SMDK4412 Board
ARM: EXYNOS4: Add MCT support for EXYNOS4412
ARM: EXYNOS4: Add functions for gic interrupt handling
ARM: EXYNOS4: Add support clock for EXYNOS4412
ARM: EXYNOS4: Add support new EXYNOS4412 SoC
ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212
ARM: EXYNOS4: Add support PPI in external GIC
ARM: EXYNOS4: convert boot_params to atag_offset
ixp4xx: support omicron ixp425 based boards
ARM: EXYNOS4: Add support SMDK4212 Board
ARM: EXYNOS4: Add support PM for EXYNOS4212
ARM: EXYNOS4: Add support clock for EXYNOS4212
ARM: EXYNOS4: Add support new EXYNOS4212 SoC
at91: USB-A9G20 C01 & C11 board support
at91: merge board USB-A9260 and USB-A9263 together
at91: add support for RSIs EWS board
ARM: SAMSUNG: Fix mask value for S5P64X0 CPU IDs
ARM: SAMSUNG: Fix mask for S3C64xx CPU IDs
...
Diffstat (limited to 'arch/arm/mach-ixp4xx/Makefile')
| -rw-r--r-- | arch/arm/mach-ixp4xx/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile index d807fc367dd3..eded94c96dd4 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile | |||
| @@ -10,6 +10,7 @@ obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o | |||
| 10 | obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o | 10 | obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o |
| 11 | obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o | 11 | obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o |
| 12 | obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o | 12 | obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o |
| 13 | obj-pci-$(CONFIG_MACH_MICCPT) += miccpt-pci.o | ||
| 13 | obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o | 14 | obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o |
| 14 | obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o | 15 | obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o |
| 15 | obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o | 16 | obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o |
| @@ -25,6 +26,9 @@ obj-$(CONFIG_MACH_AVILA) += avila-setup.o | |||
| 25 | obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o | 26 | obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o |
| 26 | obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o | 27 | obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o |
| 27 | obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o | 28 | obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o |
| 29 | obj-$(CONFIG_MACH_DEVIXP) += omixp-setup.o | ||
| 30 | obj-$(CONFIG_MACH_MICCPT) += omixp-setup.o | ||
| 31 | obj-$(CONFIG_MACH_MIC256) += omixp-setup.o | ||
| 28 | obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o | 32 | obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o |
| 29 | obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o | 33 | obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o |
| 30 | obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o | 34 | obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o |