Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[sfrench/cifs-2.6.git] / include / asm-sh / dma.h

diff --git a/include/asm-sh/dma.h b/include/asm-sh/dma.h
index faf3051cd4290fd942c0c67d00fe3035607694dc..a65b02fd186ef4ec2bf2976846c4bdcd6b9f2201 100644 (file)
--- a/include/asm-sh/dma.h
+++ b/include/asm-sh/dma.h
@@ -13,6 +13,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/sched.h>
 #include <linux/sysdev.h>
 #include <asm/cpu/dma.h>
 
@@ -110,6 +111,7 @@ struct dma_info {
 
        struct list_head list;
        int first_channel_nr;
+       int first_vchannel_nr;
 };
 
 struct dma_chan_caps {
@@ -150,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;