From c02775274bb6e4d51988672e47d854f7664ff461 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 24 Nov 2006 14:48:14 +0900
Subject: [PATCH] --- yaml --- r: 42597 b: refs/heads/master c:
 49f860bb5db877a2c75642e7e19af40e3010afec h: refs/heads/master i:   42595:
 d3417d5ad94a37d4343c8c2488be48d4680b04b2 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sh/drivers/dma/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2725229313b3..a98b2cde8ac3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dfc119f1c0723c54a20ff5ca4ea460ce7a4edb5
+refs/heads/master: 49f860bb5db877a2c75642e7e19af40e3010afec
diff --git a/trunk/arch/sh/drivers/dma/Makefile b/trunk/arch/sh/drivers/dma/Makefile
index 065d4c90970e..db1295d32268 100644
--- a/trunk/arch/sh/drivers/dma/Makefile
+++ b/trunk/arch/sh/drivers/dma/Makefile
@@ -2,8 +2,8 @@
 # Makefile for the SuperH DMA specific kernel interface routines under Linux.
 #
 
-obj-y				+= dma-api.o dma-isa.o
+obj-y				+= dma-api.o
+obj-$(CONFIG_ISA_DMA_API)	+= dma-isa.o
 obj-$(CONFIG_SYSFS)		+= dma-sysfs.o
 obj-$(CONFIG_SH_DMA)		+= dma-sh.o
 obj-$(CONFIG_SH_DREAMCAST)	+= dma-pvr2.o dma-g2.o
-