diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-06 15:58:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-06 15:58:29 -0400 |
| commit | 5cd47155155a32e5b944ac9fc3f3dc578e429aa0 (patch) | |
| tree | ea05bfdbae04eb5ffbafa2c58fc68897a3f541d6 /arch/arm/configs | |
| parent | 6f95416ebe81b3ad63884538555efb81cb05749f (diff) | |
| parent | 28bd3a0dcce11bea6f99a351cc64053dff00196e (diff) | |
Merge branch 'ixp4xx' into devel
Conflicts:
include/asm-arm/arch-ixp4xx/io.h
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/ixp4xx_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig index fabf74c51a88..db850a5689eb 100644 --- a/arch/arm/configs/ixp4xx_defconfig +++ b/arch/arm/configs/ixp4xx_defconfig | |||
| @@ -117,11 +117,13 @@ CONFIG_ARCH_ADI_COYOTE=y | |||
| 117 | CONFIG_ARCH_IXDP425=y | 117 | CONFIG_ARCH_IXDP425=y |
| 118 | CONFIG_MACH_IXDPG425=y | 118 | CONFIG_MACH_IXDPG425=y |
| 119 | CONFIG_MACH_IXDP465=y | 119 | CONFIG_MACH_IXDP465=y |
| 120 | CONFIG_MACH_KIXRP435=y | ||
| 120 | CONFIG_ARCH_IXCDP1100=y | 121 | CONFIG_ARCH_IXCDP1100=y |
| 121 | CONFIG_ARCH_PRPMC1100=y | 122 | CONFIG_ARCH_PRPMC1100=y |
| 122 | CONFIG_MACH_NAS100D=y | 123 | CONFIG_MACH_NAS100D=y |
| 123 | CONFIG_ARCH_IXDP4XX=y | 124 | CONFIG_ARCH_IXDP4XX=y |
| 124 | CONFIG_CPU_IXP46X=y | 125 | CONFIG_CPU_IXP46X=y |
| 126 | CONFIG_CPU_IXP43X=y | ||
| 125 | # CONFIG_MACH_GTWX5715 is not set | 127 | # CONFIG_MACH_GTWX5715 is not set |
| 126 | 128 | ||
| 127 | # | 129 | # |