diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:32:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:32:14 -0500 |
| commit | 7f36b1e9582c06d0ddef5f2416c9b17017647d1f (patch) | |
| tree | f83cbcef623476b9b8a14f7a0cc66eb92552a651 /arch/arm/configs/ixp4xx_defconfig | |
| parent | 0e016b9fa134d79341cca5e336ccbcea066d5f81 (diff) | |
| parent | 73ee723e4c6d179c2e9496cc4caf160a18d95603 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/configs/ixp4xx_defconfig')
| -rw-r--r-- | arch/arm/configs/ixp4xx_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig index c279e41ed10e..f74c926beb42 100644 --- a/arch/arm/configs/ixp4xx_defconfig +++ b/arch/arm/configs/ixp4xx_defconfig | |||
| @@ -104,7 +104,7 @@ CONFIG_ARCH_IXCDP1100=y | |||
| 104 | CONFIG_ARCH_PRPMC1100=y | 104 | CONFIG_ARCH_PRPMC1100=y |
| 105 | CONFIG_ARCH_IXDP4XX=y | 105 | CONFIG_ARCH_IXDP4XX=y |
| 106 | CONFIG_CPU_IXP46X=y | 106 | CONFIG_CPU_IXP46X=y |
| 107 | CONFIG_MACH_GTWX5715=y | 107 | # CONFIG_MACH_GTWX5715 is not set |
| 108 | 108 | ||
| 109 | # | 109 | # |
| 110 | # IXP4xx Options | 110 | # IXP4xx Options |