This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / core / memory.c

diff --git a/sound/core/memory.c b/sound/core/memory.c
index 45d419c..21f76c2 100644 (file)
--- a/sound/core/memory.c
+++ b/sound/core/memory.c
@@ -257,7 +257,7 @@ char *snd_kmalloc_strdup(const char *string, int flags)
  *
  * Returns zero if successful, or non-zero on failure.
  */
-int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count)
+int copy_to_user_fromio(void __user *dst, unsigned long src, size_t count)
 {
 #if defined(__i386__) || defined(CONFIG_SPARC32)
        return copy_to_user(dst, (const void*)src, count) ? -EFAULT : 0;
@@ -267,7 +267,7 @@ int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size
                size_t c = count;
                if (c > sizeof(buf))
                        c = sizeof(buf);
-               memcpy_fromio(buf, src, c);
+               memcpy_fromio(buf, (void*)src, c);
                if (copy_to_user(dst, buf, c))
                        return -EFAULT;
                count -= c;
@@ -288,7 +288,7 @@ int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size
  *
  * Returns zero if successful, or non-zero on failure.
  */
-int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count)
+int copy_from_user_toio(unsigned long dst, const void __user *src, size_t count)
 {
 #if defined(__i386__) || defined(CONFIG_SPARC32)
        return copy_from_user((void*)dst, src, count) ? -EFAULT : 0;
@@ -300,7 +300,7 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size
                        c = sizeof(buf);
                if (copy_from_user(buf, src, c))
                        return -EFAULT;
-               memcpy_toio(dst, buf, c);
+               memcpy_toio((void*)dst, buf, c);
                count -= c;
                dst += c;
                src += c;