diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 17:52:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 17:52:43 -0400 |
| commit | f9cc8475e7595dbb41a9567f83288e2cd7445b6c (patch) | |
| tree | ee7b80def9339c51413f6bb5fc9557643dc4ead0 /arch/arm/Kconfig | |
| parent | 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 (diff) | |
| parent | 5b802344357338a4d645beac8ca97470bcbe3542 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3490/1: i.MX: move uart resources to board files
[ARM] 3488/1: make icedcc_putc do the right thing
[ARM] 3487/1: IXP4xx: Support non-PCI systems
[ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1dbf6ddb300d..08b7cc900cae 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -150,8 +150,6 @@ config ARCH_IOP3XX | |||
| 150 | 150 | ||
| 151 | config ARCH_IXP4XX | 151 | config ARCH_IXP4XX |
| 152 | bool "IXP4xx-based" | 152 | bool "IXP4xx-based" |
| 153 | select DMABOUNCE | ||
| 154 | select PCI | ||
| 155 | help | 153 | help |
| 156 | Support for Intel's IXP4XX (XScale) family of processors. | 154 | Support for Intel's IXP4XX (XScale) family of processors. |
| 157 | 155 | ||