aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 05:50:54 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-27 05:50:54 -0400
commit4944dd62de21230af039eda7cd218e9a09021d11 (patch)
treebac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/arm/Kconfig
parentf17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c5b431e231dd..9722f8bb506c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -355,7 +355,7 @@ config ARCH_IXP4XX
355 select GENERIC_GPIO 355 select GENERIC_GPIO
356 select GENERIC_TIME 356 select GENERIC_TIME
357 select GENERIC_CLOCKEVENTS 357 select GENERIC_CLOCKEVENTS
358 select ZONE_DMA if PCI 358 select DMABOUNCE if PCI
359 help 359 help
360 Support for Intel's IXP4XX (XScale) family of processors. 360 Support for Intel's IXP4XX (XScale) family of processors.
361 361
@@ -539,16 +539,15 @@ config ARCH_OMAP
539 help 539 help
540 Support for TI's OMAP platform (OMAP1 and OMAP2). 540 Support for TI's OMAP platform (OMAP1 and OMAP2).
541 541
542config ARCH_MSM7X00A 542config ARCH_MSM
543 bool "Qualcomm MSM7X00A" 543 bool "Qualcomm MSM"
544 select GENERIC_TIME 544 select GENERIC_TIME
545 select GENERIC_CLOCKEVENTS 545 select GENERIC_CLOCKEVENTS
546 help 546 help
547 Support for Qualcomm MSM7X00A based systems. This runs on the ARM11 547 Support for Qualcomm MSM7K based systems. This runs on the ARM11
548 apps processor of the MSM7X00A and depends on a shared memory 548 apps processor of the MSM7K and depends on a shared memory
549 interface to the ARM9 modem processor which runs the baseband stack 549 interface to the ARM9 modem processor which runs the baseband stack
550 and controls some vital subsystems (clock and power control, etc). 550 and controls some vital subsystems (clock and power control, etc).
551 <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
552 551
553endchoice 552endchoice
554 553
@@ -1255,6 +1254,8 @@ source "drivers/hid/Kconfig"
1255 1254
1256source "drivers/usb/Kconfig" 1255source "drivers/usb/Kconfig"
1257 1256
1257source "drivers/uwb/Kconfig"
1258
1258source "drivers/mmc/Kconfig" 1259source "drivers/mmc/Kconfig"
1259 1260
1260source "drivers/memstick/Kconfig" 1261source "drivers/memstick/Kconfig"