diff --git a/[refs] b/[refs]
index 4b23f526393f..3b78950c9e25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35f3abe97696e7563b0dbd7c825acdaab423d330
+refs/heads/master: d581593388e39d77acd643b1d7427c5ecbb85a03
diff --git a/trunk/include/asm-sh/dma.h b/trunk/include/asm-sh/dma.h
index 4c75b70b6414..a65b02fd186e 100644
--- a/trunk/include/asm-sh/dma.h
+++ b/trunk/include/asm-sh/dma.h
@@ -152,14 +152,9 @@ extern struct dma_info *get_dma_info_by_name(const char *dmac_name);
 extern int dma_extend(unsigned int chan, unsigned long op, void *param);
 extern int register_chan_caps(const char *dmac, struct dma_chan_caps *capslist);
 
-#ifdef CONFIG_SYSFS
 /* arch/sh/drivers/dma/dma-sysfs.c */
 extern int dma_create_sysfs_files(struct dma_channel *, struct dma_info *);
 extern void dma_remove_sysfs_files(struct dma_channel *, struct dma_info *);
-#else
-#define dma_create_sysfs_file(channel, info)		do { } while (0)
-#define dma_remove_sysfs_file(channel, info)		do { } while (0)
-#endif
 
 #ifdef CONFIG_PCI
 extern int isa_dma_bridge_buggy;