---

yaml --- r: 120154 b: refs/heads/master c: 78fb402 h: refs/heads/master v: v3
git-mirror · Dec 22, 2008 · 33d0bf3 · 33d0bf3
1 parent 78aa371
commit 33d0bf3
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 111 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d2685d0b3edc51ecc92604d5b7f5ca9b29b90bb
+refs/heads/master: 78fb40263f34c65ade1693664db1af168d479588
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -486,9 +486,6 @@ source "arch/sh/drivers/Kconfig"
 
 endmenu
 
-config ISA_DMA_API
-	bool
-
 menu "Kernel features"
 
 source kernel/Kconfig.hz

diff --git a/trunk/arch/sh/drivers/dma/Makefile b/trunk/arch/sh/drivers/dma/Makefile
@@ -3,7 +3,6 @@
 #
 
 obj-$(CONFIG_SH_DMA_API)	+= dma-api.o dma-sysfs.o
-obj-$(CONFIG_ISA_DMA_API)	+= dma-isa.o
 obj-$(CONFIG_SH_DMA)		+= dma-sh.o
 obj-$(CONFIG_SH_DREAMCAST)	+= dma-pvr2.o dma-g2.o
 obj-$(CONFIG_SH_DMABRG)		+= dmabrg.o
diff --git a/trunk/arch/sh/drivers/dma/dma-isa.c b/trunk/arch/sh/drivers/dma/dma-isa.c
-Original file line number
+Diff line change
@@ Expand Up / @@ -486,9 +486,6 @@ source "arch/sh/drivers/Kconfig" @@
     endmenu
-    config ISA_DMA_API
-    	bool
     menu "Kernel features"
     source kernel/Kconfig.hz
@@ Expand Down @@