2 files changed, 29 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 60299a9a7adb..055ba880aaec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4575,6 +4575,18 @@ L:	linux-pci@vger.kernel.org
 S:      Supported
 F:      drivers/pci/hotplug/shpchp*
 
+SIMPLE FIRMWARE INTERFACE (SFI)
+P:      Len Brown
+M:      lenb@kernel.org
+L:      sfi-devel@simplefirmware.org
+W:      http://simplefirmware.org/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
+S:      Supported
+F:      arch/x86/kernel/*sfi*
+F:      drivers/sfi/
+F:      include/linux/sfi*.h
+
+
 SIMTEC EB110ATX (Chalice CATS)
 P:      Ben Dooks
 M:      Vincent Sanders <support@simtec.co.uk>
diff --git a/drivers/sfi/Kconfig b/drivers/sfi/Kconfig
new file mode 100644
index 000000000000..dd115121e0b6
--- /dev/null
+++ b/drivers/sfi/Kconfig
@@ -0,0 +1,17 @@
+#
+# SFI Configuration
+#
+
+menuconfig SFI
+        bool "SFI (Simple Firmware Interface) Support"
+        ---help---
+        The Simple Firmware Interface (SFI) provides a lightweight method
+        for platform firmware to pass information to the operating system
+        via static tables in memory.  Kernel SFI support is required to
+        boot on SFI-only platforms.  Currently, all SFI-only platforms are
+        based on the 2nd generation Intel Atom processor platform,
+        code-named Moorestown.
+
+        For more information, see http://simplefirmware.org
+
+        Say 'Y' here to enable the kernel to boot on SFI-only platforms.