Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-sa1100 / Kconfig

diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index 5da8c35aa0de14f89159a24e2f05a0edc451c01b..42625e4d949a143f828ba96c155754f422aa0d65 100644 (file)
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -118,6 +118,16 @@ config SA1100_LART
          (also known as the LART).  See <http://www.lartmaker.nl/> for
          information on the LART.
 
+config SA1100_NANOENGINE
+       bool "nanoEngine"
+       select CPU_FREQ_SA1110
+       select PCI
+       select PCI_NANOENGINE
+       help
+         Say Y here if you are using the Bright Star Engineering nanoEngine.
+         See <http://www.brightstareng.com/arm/nanoeng.htm> for information
+         on the BSE nanoEngine.
+
 config SA1100_PLEB
        bool "PLEB"
        select CPU_FREQ_SA1100