1 files changed, 7 insertions, 6 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index df39d20f7425..5021db2217ed 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -356,7 +356,7 @@ config ARCH_IXP4XX
         select GENERIC_GPIO
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
-        select ZONE_DMA if PCI
+        select DMABOUNCE if PCI
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
@@ -540,16 +540,15 @@ config ARCH_OMAP
         help
           Support for TI's OMAP platform (OMAP1 and OMAP2).
 
-config ARCH_MSM7X00A
-        bool "Qualcomm MSM7X00A"
+config ARCH_MSM
+        bool "Qualcomm MSM"
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         help
-          Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
-          apps processor of the MSM7X00A and depends on a shared memory
+          Support for Qualcomm MSM7K based systems.  This runs on the ARM11
+          apps processor of the MSM7K and depends on a shared memory
           interface to the ARM9 modem processor which runs the baseband stack
           and controls some vital subsystems (clock and power control, etc).
-          <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
 
 endchoice
 
@@ -1256,6 +1255,8 @@ source "drivers/hid/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/uwb/Kconfig"
+
 source "drivers/mmc/Kconfig"
 
 source "drivers/memstick/Kconfig"