---

yaml --- r: 141347 b: refs/heads/master c: 301df5d h: refs/heads/master i: 141345: ea52f8f 141343: 05d3d10 v: v3
git-mirror · Apr 3, 2009 · c70546d · c70546d
1 parent 6ffab58
commit c70546d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76d86df9c4947fd49f320834b6d618c234ce0ed7
+refs/heads/master: 301df5dce43124e926341665182a14f13a24ff96
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -103,5 +103,7 @@ source "drivers/staging/uc2322/Kconfig"
 
 source "drivers/staging/b3dfg/Kconfig"
 
+source "drivers/staging/phison/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -34,3 +34,4 @@ obj-$(CONFIG_POHMELFS)		+= pohmelfs/
 obj-$(CONFIG_STLC45XX)		+= stlc45xx/
 obj-$(CONFIG_USB_SERIAL_ATEN2011)	+= uc2322/
 obj-$(CONFIG_B3DFG)		+= b3dfg/
+obj-$(CONFIG_IDE_PHISON)	+= phison/
diff --git a/trunk/drivers/staging/phison/Kconfig b/trunk/drivers/staging/phison/Kconfig
@@ -0,0 +1,5 @@
+config IDE_PHISON
+	tristate "PCIE ATA PS5000 IDE support"
+	depends on IDE
+	---help---
+	  This is an experimental driver for PS5000 IDE driver.
diff --git a/trunk/drivers/staging/phison/Makefile b/trunk/drivers/staging/phison/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_IDE_PHISON)	+= phison.o