diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 11:12:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 11:12:21 -0400 |
| commit | fdc76bf9b62446c9d4b00e0d355c3212b4f1b13b (patch) | |
| tree | d4266abf69b2ef462b147a33d4f905055781714b /arch/arm/Kconfig | |
| parent | 72441bdc76f7f71d7b75cdaa48f26dbb1f3d932e (diff) | |
| parent | f6335c43f3d7816ba2e69abce4f29c41f65bb27e (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] clps711x: add sparsemem definitions
[ARM] 5315/1: Fix section mismatch warning (sa1111)
[ARM] Orion: activate workaround for 88f6183 SPI clock erratum
[ARM] Orion: instantiate the dsa switch driver
[ARM] mv78xx0: force link speed/duplex on eth2/eth3
[ARM] remove extra brace in arch/arm/mach-pxa/trizeps4.c
[ARM] balance parenthesis in header file
[ARM] pxa: fix trizeps PCMCIA build
[ARM] pxa: fix trizeps defconfig
[ARM] dmabounce requires ZONE_DMA
[ARM] 5303/1: period_cycles should be greater than 1
[ARM] 5310/1: Fix cache flush functions for ARMv4
[ARM] pxa: fix 3bca103a1e658d23737d20e1989139d9ca8973bf
[ARM] pxa: fix redefinition of NR_IRQS
[ARM] S3C24XX: Fix redefine of DEFINE_TIMER() in s3c24xx pwm-clock.c
[ARM] S3C2443: Fix HCLK rate
[ARM] S3C24XX: Serial driver debug depends on DEBUG_LL
[ARM] S3C24XX: pwm-clock set_parent mask fix
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index df39d20f7425..bc0fcde20901 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -356,7 +356,7 @@ config ARCH_IXP4XX | |||
| 356 | select GENERIC_GPIO | 356 | select GENERIC_GPIO |
| 357 | select GENERIC_TIME | 357 | select GENERIC_TIME |
| 358 | select GENERIC_CLOCKEVENTS | 358 | select GENERIC_CLOCKEVENTS |
| 359 | select ZONE_DMA if PCI | 359 | select DMABOUNCE if PCI |
| 360 | help | 360 | help |
| 361 | Support for Intel's IXP4XX (XScale) family of processors. | 361 | Support for Intel's IXP4XX (XScale) family of processors. |
| 362 | 362 | ||