Merge branch 'linus' into tracing/hw-branch-tracing

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

diff --git a/arch/arm/mach-ks8695/Kconfig b/arch/arm/mach-ks8695/Kconfig
index 2754daa..fe0c82e 100644 (file)
--- a/arch/arm/mach-ks8695/Kconfig
+++ b/arch/arm/mach-ks8695/Kconfig
@@ -14,6 +14,12 @@ config MACH_DSM320
          Say 'Y' here if you want your kernel to run on the D-Link
          DSM-320 Wireless Media Player.
 
+config MACH_ACS5K
+       bool "Brivo Systems LLC, ACS-5000 Master board"
+       help
+         say 'Y' here if you want your kernel to run on the Brivo
+         Systems LLC, ACS-5000 Master board.
+
 endmenu
 
 endif