---

yaml --- r: 117757 b: refs/heads/master c: 3789798 h: refs/heads/master i: 117755: 491d724 v: v3
git-mirror · Oct 23, 2008 · 67d519e · 67d519e
1 parent 54f3299
commit 67d519e
Show file tree

Hide file tree

Showing 4 changed files with 762 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f1ab2745be4afc77446f17dd575a7e5695710fd
+refs/heads/master: 37897989232e6533772b0e24369b35ee9f56c8b6
diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
@@ -720,6 +720,11 @@ config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        default "128"
        depends on BLK_DEV_IDE_AU1XXX
 
+config BLK_DEV_IDE_TX4939
+	tristate "TX4939 internal IDE support"
+	depends on SOC_TX4939
+	select BLK_DEV_IDEDMA_SFF
+
 config IDE_ARM
 	tristate "ARM IDE support"
 	depends on ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK)

diff --git a/trunk/drivers/ide/Makefile b/trunk/drivers/ide/Makefile
@@ -111,3 +111,5 @@ obj-$(CONFIG_BLK_DEV_IDE_RAPIDE)	+= rapide.o
 obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710)	+= palm_bk3710.o
 
 obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)	+= au1xxx-ide.o
+
+obj-$(CONFIG_BLK_DEV_IDE_TX4939)	+= tx4939ide.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,3 +111,5 @@ obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o
		obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o

		obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o

		obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o