Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / include / asm-m68k / dsp56k.h

diff --git a/include/asm-m68k/dsp56k.h b/include/asm-m68k/dsp56k.h
index ab3dd33e23a116e81916a93cce09960981301940..2d8c0c9f794b3dfc314ba4d357ec63900473daac 100644 (file)
--- a/include/asm-m68k/dsp56k.h
+++ b/include/asm-m68k/dsp56k.h
@@ -13,7 +13,7 @@
 /* Used for uploading DSP binary code */
 struct dsp56k_upload {
        int len;
-       char *bin;
+       char __user *bin;
 };
 
 /* For the DSP host flags */