diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 12:17:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 12:17:27 -0400 |
commit | 946880fa270c18c137654af70ba939f03181c6b6 (patch) | |
tree | 1fc66f0f55c17be3026d55fc261f4cbddaf80e90 /arch/arm/mach-ixp4xx/Makefile | |
parent | 636d17427b1ef0e97bd9df9b3b0e0f314ff889d3 (diff) | |
parent | 42ea573f872365b0797ddbcee2e1f1f48913f507 (diff) |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
IXP4xx: Fix LL debugging on little-endian CPU.
IXP4xx: Fix sparse warnings in I/O primitives.
IXP4xx: Make mdio_bus struct static in the Ethernet driver.
IXP4xx: Fix ixp4xx_crypto little-endian operation.
IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.
ixp4xx/vulcan: add PCI support
ixp4xx: base support for Arcom Vulcan
Diffstat (limited to 'arch/arm/mach-ixp4xx/Makefile')
-rw-r--r-- | arch/arm/mach-ixp4xx/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile index 47d1f60d23f..d807fc367dd 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile | |||
@@ -16,6 +16,7 @@ obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o | |||
16 | obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o | 16 | obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o |
17 | obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o | 17 | obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o |
18 | obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o | 18 | obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o |
19 | obj-pci-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-pci.o | ||
19 | 20 | ||
20 | obj-y += common.o | 21 | obj-y += common.o |
21 | 22 | ||
@@ -31,6 +32,7 @@ obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o | |||
31 | obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o | 32 | obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o |
32 | obj-$(CONFIG_MACH_FSG) += fsg-setup.o | 33 | obj-$(CONFIG_MACH_FSG) += fsg-setup.o |
33 | obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o | 34 | obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o |
35 | obj-$(CONFIG_MACH_ARCOM_VULCAN) += vulcan-setup.o | ||
34 | 36 | ||
35 | obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o | 37 | obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o |
36 | obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o | 38 | obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o |