---

yaml --- r: 205200 b: refs/heads/master c: 155bf48 h: refs/heads/master v: v3
git-mirror · Aug 1, 2010 · b9ce8d9 · b9ce8d9
1 parent 1c02e9c
commit b9ce8d9
Show file tree

Hide file tree

Showing 4 changed files with 694 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62936009f35a6659cc3ebe0d90c754182d60da73
+refs/heads/master: 155bf48f10fc3c8e0e3125e221981328cd925cf4
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
@@ -805,6 +805,15 @@ config PATA_RZ1000
 
 	  If unsure, say N.
 
+config PATA_SAMSUNG_CF
+	tristate "Samsung SoC PATA support"
+	depends on SAMSUNG_DEV_IDE
+	help
+	  This option enables basic support for Samsung's S3C/S5P board
+	  PATA controllers via the new ATA layer
+
+	  If unsure, say N.
+
 config PATA_WINBOND_VLB
 	tristate "Winbond W83759A VLB PATA support (Experimental)"
 	depends on ISA && EXPERIMENTAL

diff --git a/trunk/drivers/ata/Makefile b/trunk/drivers/ata/Makefile
@@ -88,6 +88,7 @@ obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_of_platform.o
 obj-$(CONFIG_PATA_QDI)		+= pata_qdi.o
 obj-$(CONFIG_PATA_RB532)	+= pata_rb532_cf.o
 obj-$(CONFIG_PATA_RZ1000)	+= pata_rz1000.o
+obj-$(CONFIG_PATA_SAMSUNG_CF)	+= pata_samsung_cf.o
 obj-$(CONFIG_PATA_WINBOND_VLB)	+= pata_winbond.o
 
 # Should be last but two libata driver