---

yaml --- r: 205851 b: refs/heads/master c: 8dd1260 h: refs/heads/master i: 205849: 40e9e1b 205847: dddd7ff v: v3
git-mirror · Jul 8, 2010 · 436e639 · 436e639
1 parent a7c2afd
commit 436e639
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6da4cd46902973f267fcc93325f65a93eca52ad5
+refs/heads/master: 8dd1260f93ecc28cb36fd75e15ddca34b571602e
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -155,5 +155,7 @@ source "drivers/staging/solo6x10/Kconfig"
 
 source "drivers/staging/tidspbridge/Kconfig"
 
+source "drivers/staging/quickstart/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -58,3 +58,4 @@ obj-$(CONFIG_MSM_STAGING)	+= msm/
 obj-$(CONFIG_EASYCAP)		+= easycap/
 obj-$(CONFIG_SOLO6X10)		+= solo6x10/
 obj-$(CONFIG_TIDSPBRIDGE)	+= tidspbridge/
+obj-$(CONFIG_ACPI_QUICKSTART)	+= quickstart/
diff --git a/trunk/drivers/staging/quickstart/Kconfig b/trunk/drivers/staging/quickstart/Kconfig
@@ -0,0 +1,10 @@
+config ACPI_QUICKSTART
+	tristate "ACPI Quickstart key driver"
+	depends on ACPI
+	help
+	  Say Y here if you have a platform that supports the ACPI
+	  quickstart key protocol.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called quickstart.
+
diff --git a/trunk/drivers/staging/quickstart/Makefile b/trunk/drivers/staging/quickstart/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ACPI_QUICKSTART)		+= quickstart.o