vserver 1.9.3

[linux-2.6.git] / include / sound / info.h

diff --git a/include/sound/info.h b/include/sound/info.h
index 9e33b58..e9efd4e 100644 (file)
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -54,9 +54,11 @@ struct snd_info_entry_ops {
        int (*release) (snd_info_entry_t * entry,
                        unsigned short mode, void *file_private_data);
        long (*read) (snd_info_entry_t *entry, void *file_private_data,
-                     struct file * file, char __user *buf, long count);
+                     struct file * file, char __user *buf,
+                     unsigned long count, unsigned long pos);
        long (*write) (snd_info_entry_t *entry, void *file_private_data,
-                      struct file * file, const char __user *buf, long count);
+                      struct file * file, const char __user *buf,
+                      unsigned long count, unsigned long pos);
        long long (*llseek) (snd_info_entry_t *entry, void *file_private_data,
                            struct file * file, long long offset, int orig);
        unsigned int (*poll) (snd_info_entry_t *entry, void *file_private_data,
@@ -89,9 +91,12 @@ struct snd_info_entry {
 
 extern int snd_info_check_reserved_words(const char *str);
 
-#ifdef CONFIG_SND_OSSEMUL
+#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
 extern int snd_info_minor_register(void);
 extern int snd_info_minor_unregister(void);
+#else
+#define snd_info_minor_register() /* NOP */
+#define snd_info_minor_unregister() /* NOP */
 #endif