This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/sound/core.h b/include/sound/core.h
index 2aab6f7..8468522 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -307,8 +307,8 @@ void snd_hidden_vfree(void *obj);
 #define vfree_nocheck(obj) vfree(obj)
 #endif
 char *snd_kmalloc_strdup(const char *string, int flags);
-int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);
-int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);
+int copy_to_user_fromio(void __user *dst, unsigned long src, size_t count);
+int copy_from_user_toio(unsigned long dst, const void __user *src, size_t count);
 
 /* init.c */
 
@@ -417,7 +417,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
  */
 #define snd_assert(expr, args...) do {\
        if (unlikely(!(expr))) {                                \
-               snd_printk(KERN_ERR "BUG? (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
+               snd_printk("BUG? (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
                args;\
        }\
 } while (0)
@@ -433,7 +433,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
  */
 #define snd_runtime_check(expr, args...) do {\
        if (unlikely(!(expr))) {                                \
-               snd_printk(KERN_ERR "ERROR (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
+               snd_printk("ERROR (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
                args;\
        }\
 } while (0)