Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh

[pandora-kernel.git] / arch / arm / mach-davinci / Kconfig

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index c0deaca..32d837d 100644 (file)
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -192,6 +192,16 @@ config DA850_UI_RMII
 
 endchoice
 
+config DA850_WL12XX
+       bool "AM18x wl1271 daughter board"
+       depends on MACH_DAVINCI_DA850_EVM
+       help
+         The wl1271 daughter card for AM18x EVMs is a combo wireless
+         connectivity add-on card, based on the LS Research TiWi module with
+         Texas Instruments' wl1271 solution.
+         Say Y if you want to use a wl1271 expansion card connected to the
+         AM18x EVM.
+
 config GPIO_PCA953X
        default MACH_DAVINCI_DA850_EVM