From c70546d126bd84287d87c31acd0450e6286d855e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 9 Feb 2009 13:02:35 -0800
Subject: [PATCH] --- yaml --- r: 141347 b: refs/heads/master c:
 301df5dce43124e926341665182a14f13a24ff96 h: refs/heads/master i:   141345:
 ea52f8ff7878b030cbb8b615c31a1fb4b4f906cf   141343:
 05d3d10ba43c806a1a20837d541bee9313c05d2d v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/Kconfig         | 2 ++
 trunk/drivers/staging/Makefile        | 1 +
 trunk/drivers/staging/phison/Kconfig  | 5 +++++
 trunk/drivers/staging/phison/Makefile | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 trunk/drivers/staging/phison/Kconfig
 create mode 100644 trunk/drivers/staging/phison/Makefile

diff --git a/[refs] b/[refs]
index 4cb52412a7c0..b25c952111c1 100644
--- 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
index c2accb8fe0ab..29dfff77e3b0 100644
--- 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
index aa1c5c49e6a9..a9b85e8bdc5d 100644
--- 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
new file mode 100644
index 000000000000..2b3920b84daf
--- /dev/null
+++ 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
new file mode 100644
index 000000000000..7642a2190e91
--- /dev/null
+++ b/trunk/drivers/staging/phison/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_IDE_PHISON)	+= phison.o